Re: kfree_skb() no. of args in .86

Miquel van Smoorenburg (miquels@cistron.nl)
11 Feb 1998 17:02:00 +0100

In article <19980211071653.44178@linux.bogus>,
Erik Elmgren <erik.elmgren@swipnet.se> wrote:
>Needs this to _compile_ on my box..
[patch deleted]

Yes, unfortunately the tabs were converted to spaces soemweher along the
way. Here is a fixed version for those interested, it also has a two
line fix for ISDN to compile (I haven't tested dialout but the HiSax
module loads and sees the D channel traffic at least).

diff -ruN linux-2.1.86.orig/drivers/isdn/isdn_common.c linux-2.1.86-fix01/drivers/isdn/isdn_common.c
--- linux-2.1.86.orig/drivers/isdn/isdn_common.c Tue Feb 10 22:07:50 1998
+++ linux-2.1.86-fix01/drivers/isdn/isdn_common.c Wed Feb 11 14:49:26 1998
@@ -261,10 +261,10 @@
#endif

static __inline void
-isdn_trash_skb(struct sk_buff *skb, int rw)
+isdn_trash_skb(struct sk_buff *skb)
{
SET_SKB_FREE(skb);
- kfree_skb(skb, rw);
+ kfree_skb(skb);
}

static void
diff -ruN linux-2.1.86.orig/net/ipv4/devinet.c linux-2.1.86-fix01/net/ipv4/devinet.c
--- linux-2.1.86.orig/net/ipv4/devinet.c Tue Jan 13 00:28:27 1998
+++ linux-2.1.86-fix01/net/ipv4/devinet.c Wed Feb 11 12:19:34 1998
@@ -784,7 +784,7 @@
return;
}
if (inet_fill_ifaddr(skb, ifa, 0, 0, event) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
netlink_set_err(rtnl, 0, RTMGRP_IPV4_IFADDR, EINVAL);
return;
}
diff -ruN linux-2.1.86.orig/net/ipv4/fib_hash.c linux-2.1.86-fix01/net/ipv4/fib_hash.c
--- linux-2.1.86.orig/net/ipv4/fib_hash.c Sun Nov 30 23:00:39 1997
+++ linux-2.1.86-fix01/net/ipv4/fib_hash.c Wed Feb 11 12:20:48 1998
@@ -715,7 +715,7 @@
if (fib_dump_info(skb, pid, n->nlmsg_seq, event, tb_id,
f->fn_type, f->fn_scope, &f->fn_key, z, f->fn_tos,
FIB_INFO(f)) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return;
}
NETLINK_CB(skb).dst_groups = RTMGRP_IPV4_ROUTE;
diff -ruN linux-2.1.86.orig/net/netlink/af_netlink.c linux-2.1.86-fix01/net/netlink/af_netlink.c
--- linux-2.1.86.orig/net/netlink/af_netlink.c Tue Jan 13 00:28:28 1998
+++ linux-2.1.86-fix01/net/netlink/af_netlink.c Wed Feb 11 12:21:30 1998
@@ -370,7 +370,7 @@
if (nonblock) {
sti();
netlink_unlock(sk);
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return -EAGAIN;
}
interruptible_sleep_on(sk->sleep);
@@ -378,7 +378,7 @@
sti();

if (signal_pending(current)) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return -ERESTARTSYS;
}
goto retry;
@@ -392,7 +392,7 @@
netlink_unlock(sk);
return len;
}
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return -ECONNREFUSED;
}

@@ -466,8 +466,8 @@
netlink_unlock_table(protocol, allocation == GFP_KERNEL);

if (skb2)
- kfree_skb(skb2, 0);
- kfree_skb(skb, 0);
+ kfree_skb(skb2);
+ kfree_skb(skb);
}

void netlink_set_err(struct sock *ssk, pid_t pid, unsigned group, int code)
@@ -630,7 +630,7 @@
static void netlink_destroy_callback(struct netlink_callback *cb)
{
if (cb->skb)
- kfree_skb(cb->skb, 0);
+ kfree_skb(cb->skb);
kfree(cb);
}

-- 
 Miquel van Smoorenburg |  The dyslexic, agnostic, insomniac lay in his bed
    miquels@cistron.nl  |  awake all night wondering if there is a doG


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu