diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /net/core | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dst.c | 1 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index 990d86682..50b160a4c 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -5,7 +5,6 @@ * */ -#include <asm/segment.h> #include <asm/system.h> #include <asm/bitops.h> #include <linux/types.h> diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 58aeb6cc9..7c8a332e2 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -237,8 +237,10 @@ void __kfree_skb(struct sk_buff *skb) dst_release(skb->dst); if(skb->destructor) skb->destructor(skb); +#ifdef CONFIG_NET if(skb->rx_dev) dev_put(skb->rx_dev); +#endif skb_headerinit(skb, NULL, 0); /* clean state */ kfree_skbmem(skb); } |