aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2009-03-11 05:49:55 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-13 15:09:28 -0400
commitead2ceb0ec9f85cff19c43b5cdb2f8a054484431 (patch)
tree258874b824bf241698d943daa9298bb18955e451 /net/ipv4
parent4893d39e865b2897bf9fcd329697d37032d853a1 (diff)
Network Drop Monitor: Adding kfree_skb_clean for non-drops and modifying end-of-line points for skbs
Signed-off-by: Neil Horman <nhorman@tuxdriver.com> include/linux/skbuff.h | 4 +++- net/core/datagram.c | 2 +- net/core/skbuff.c | 22 ++++++++++++++++++++++ net/ipv4/arp.c | 2 +- net/ipv4/udp.c | 2 +- net/packet/af_packet.c | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/arp.c2
-rw-r--r--net/ipv4/udp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 3d67d1ffed77..9c220323f353 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -892,7 +892,7 @@ static int arp_process(struct sk_buff *skb)
892out: 892out:
893 if (in_dev) 893 if (in_dev)
894 in_dev_put(in_dev); 894 in_dev_put(in_dev);
895 kfree_skb(skb); 895 consume_skb(skb);
896 return 0; 896 return 0;
897} 897}
898 898
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 4bd178a111d5..05b7abb99f69 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1184,7 +1184,7 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
1184 sk = sknext; 1184 sk = sknext;
1185 } while (sknext); 1185 } while (sknext);
1186 } else 1186 } else
1187 kfree_skb(skb); 1187 consume_skb(skb);
1188 spin_unlock(&hslot->lock); 1188 spin_unlock(&hslot->lock);
1189 return 0; 1189 return 0;
1190} 1190}