Hi,
I needed to use part of this patch to get 2.1.86 to compile for me.
Then I just grep'd the whole thing and changed all the other occurances
of two arguments to [dev_]kfree_skb to eliminate the second arg. Unless
I messed up, this should probably go into 2.1.87.
-Myrdraal
--vtzGhvizbBRQ85DL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="kfree-2.1.86.diff"
diff -r -u linpatch/arch/sparc/ap1000/tnet.c linux/arch/sparc/ap1000/tnet.c
--- linpatch/arch/sparc/ap1000/tnet.c Wed Feb 11 12:06:14 1998
+++ linux/arch/sparc/ap1000/tnet.c Wed Feb 11 11:57:37 1998
@@ -578,7 +578,7 @@
static void free_skb(struct sk_buff *skb, int op)
{
- dev_kfree_skb(skb,op);
+ dev_kfree_skb(skb);
}
void tnet_send_ip(int cid,struct sk_buff *skb)
diff -r -u linpatch/drivers/isdn/isdn_common.c linux/drivers/isdn/isdn_common.c
--- linpatch/drivers/isdn/isdn_common.c Wed Feb 11 12:06:14 1998
+++ linux/drivers/isdn/isdn_common.c Wed Feb 11 11:56:06 1998
@@ -264,7 +264,7 @@
isdn_trash_skb(struct sk_buff *skb, int rw)
{
SET_SKB_FREE(skb);
- kfree_skb(skb, rw);
+ kfree_skb(skb);
}
static void
diff -r -u linpatch/net/bridge/br.c linux/net/bridge/br.c
--- linpatch/net/bridge/br.c Wed Feb 11 12:06:13 1998
+++ linux/net/bridge/br.c Wed Feb 11 11:52:42 1998
@@ -1386,7 +1386,7 @@
static int br_drop(struct sk_buff *skb)
{
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return(1);
}
@@ -1396,7 +1396,7 @@
static int br_dev_drop(struct sk_buff *skb)
{
- dev_kfree_skb(skb, 0);
+ dev_kfree_skb(skb);
return(1);
}
diff -r -u linpatch/net/core/neighbour.c linux/net/core/neighbour.c
--- linpatch/net/core/neighbour.c Wed Feb 11 12:06:12 1998
+++ linux/net/core/neighbour.c Wed Feb 11 11:49:15 1998
@@ -1127,7 +1127,7 @@
return;
if (neigh_fill_info(skb, n, 0, 0, RTM_GETNEIGH) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return;
}
nlh = (struct nlmsghdr*)skb->data;
@@ -1147,7 +1147,7 @@
return;
if (neigh_fill_info(skb, n, 0, 0, RTM_NEWNEIGH) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
return;
}
nlh = (struct nlmsghdr*)skb->data;
diff -r -u linpatch/net/ipv4/devinet.c linux/net/ipv4/devinet.c
--- linpatch/net/ipv4/devinet.c Wed Feb 11 12:06:12 1998
+++ linux/net/ipv4/devinet.c Wed Feb 11 08:14:16 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 -r -u linpatch/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
--- linpatch/net/ipv4/fib_hash.c Wed Feb 11 12:06:12 1998
+++ linux/net/ipv4/fib_hash.c Wed Feb 11 08:20:42 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 -r -u linpatch/net/ipv6/addrconf.c linux/net/ipv6/addrconf.c
--- linpatch/net/ipv6/addrconf.c Wed Feb 11 12:06:13 1998
+++ linux/net/ipv6/addrconf.c Wed Feb 11 11:51:32 1998
@@ -1530,7 +1530,7 @@
return;
}
if (inet6_fill_ifaddr(skb, ifa, 0, 0, event) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
netlink_set_err(rtnl, 0, RTMGRP_IPV6_IFADDR, EINVAL);
return;
}
diff -r -u linpatch/net/ipv6/route.c linux/net/ipv6/route.c
--- linpatch/net/ipv6/route.c Wed Feb 11 12:06:13 1998
+++ linux/net/ipv6/route.c Wed Feb 11 11:52:13 1998
@@ -1749,7 +1749,7 @@
return;
}
if (rt6_fill_node(skb, rt, event, 0, 0) < 0) {
- kfree_skb(skb, 0);
+ kfree_skb(skb);
netlink_set_err(rtnl, 0, RTMGRP_IPV6_ROUTE, EINVAL);
return;
}
diff -r -u linpatch/net/netlink/af_netlink.c linux/net/netlink/af_netlink.c
--- linpatch/net/netlink/af_netlink.c Wed Feb 11 12:06:14 1998
+++ linux/net/netlink/af_netlink.c Wed Feb 11 08:25:40 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);
}
--vtzGhvizbBRQ85DL--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu