Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Feb 2009 11:50:29 +0000 (03:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Feb 2009 11:50:29 +0000 (03:50 -0800)
18 files changed:
1  2 
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/cxgb3/cxgb3_main.c
drivers/net/forcedeth.c
drivers/net/mv643xx_eth.c
drivers/net/smsc911x.c
drivers/net/smsc9420.c
drivers/net/sungem.c
drivers/net/tg3.c
drivers/net/wimax/i2400m/i2400m.h
fs/compat_ioctl.c
include/linux/pci_ids.h
include/linux/skbuff.h
include/net/sock.h
net/core/net_namespace.c
net/core/skbuff.c
net/core/sock.c
net/ipv4/tcp_output.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index e5a8351ff12d5be925fedaad8f7d3ec0d2a3849c,c6a6b166f8d6f733a4dc9f7143bd565aaddf7e8f..33640d99c8ed65794458f4a673e45724232ef520
@@@ -144,16 -142,7 +144,8 @@@ void skb_under_panic(struct sk_buff *sk
               skb->dev ? skb->dev->name : "<NULL>");
        BUG();
  }
 +EXPORT_SYMBOL(skb_under_panic);
  
- void skb_truesize_bug(struct sk_buff *skb)
- {
-       WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) "
-              "len=%u, sizeof(sk_buff)=%Zd\n",
-              skb->truesize, skb->len, sizeof(struct sk_buff));
- }
- EXPORT_SYMBOL(skb_truesize_bug);
  /*    Allocate a new skbuff. We do this ourselves so we can fill in a few
   *    'private' fields and also do memory statistics to find all the
   *    [BEEP] leaks.
diff --cc net/core/sock.c
Simple merge
Simple merge