Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Thu, 21 Oct 2010 15:43:05 +0000 (08:43 -0700)]
Conflicts:
net/core/dev.c

13 files changed:
1  2 
MAINTAINERS
drivers/net/b44.c
drivers/net/ehea/ehea_main.c
drivers/net/gianfar_ethtool.c
drivers/net/r6040.c
drivers/net/tg3.c
drivers/net/tg3.h
drivers/vhost/vhost.c
include/linux/Kbuild
net/bluetooth/l2cap.c
net/core/dev.c
net/rds/page.c
net/tipc/subscr.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2811,9 -2755,11 +2811,9 @@@ struct tg3 
        struct vlan_group               *vlgrp;
  #endif
  
 -      struct tg3_rx_prodring_set      prodring[TG3_IRQ_MAX_VECS];
 -
  
        /* begin "everything else" cacheline(s) section */
-       struct rtnl_link_stats64        net_stats;
+       unsigned long                   rx_dropped;
        struct rtnl_link_stats64        net_stats_prev;
        struct tg3_ethtool_stats        estats;
        struct tg3_ethtool_stats        estats_prev;
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
@@@ -1483,9 -1484,8 +1483,9 @@@ int dev_forward_skb(struct net_device *
        skb_orphan(skb);
        nf_reset(skb);
  
 -      if (!(dev->flags & IFF_UP) ||
 -          (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN))) {
 +      if (unlikely(!(dev->flags & IFF_UP) ||
-                    (skb->len > (dev->mtu + dev->hard_header_len)))) {
++                   (skb->len > (dev->mtu + dev->hard_header_len + VLAN_HLEN)))) {
 +              atomic_long_inc(&dev->rx_dropped);
                kfree_skb(skb);
                return NET_RX_DROP;
        }
diff --cc net/rds/page.c
Simple merge
Simple merge