Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/e1000e/hw.h
	net/bridge/br_device.c
	net/bridge/br_input.c

diff --cc drivers/net/e1000e/hw.h
index 0cd569a57f6d2546bfcf9bb0bb248ec00422a77a,664ed5812cff6f57e97a036f6660d381ac728348..a419b0715985d32c9b937dde9c86397756441beb
--- 1/drivers/net/e1000e/hw.h
--- 2/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@@ -312,8 -308,8 +312,8 @@@ enum e1e_registers 
  #define E1000_KMRNCTRLSTA_INBAND_PARAM        0x9    /* Kumeran InBand Parameters */
  #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */
  #define E1000_KMRNCTRLSTA_K1_CONFIG   0x7
- #define E1000_KMRNCTRLSTA_K1_ENABLE   0x140E
+ #define E1000_KMRNCTRLSTA_K1_ENABLE   0x0002
 -#define E1000_KMRNCTRLSTA_K1_DISABLE  0x1400
 +#define E1000_KMRNCTRLSTA_HD_CTRL     0x0002
  
  #define IFE_PHY_EXTENDED_STATUS_CONTROL       0x10
  #define IFE_PHY_SPECIAL_CONTROL               0x11 /* 100BaseTx PHY Special Control */

diff --cc net/bridge/br_device.c
index 075c435ad22d85810fbeecbae807309cca3582bb,f49bcd9d9113cad7bde8e95d557d42329eeddf46..cf09fe591fc20cc73a2fdd20d13860f88c33134d
--- 1/net/bridge/br_device.c
--- 2/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@@ -48,13 -46,12 +48,16 @@@ netdev_tx_t br_dev_xmit(struct sk_buff 
        skb_reset_mac_header(skb);
        skb_pull(skb, ETH_HLEN);
  
+       rcu_read_lock();
        if (is_multicast_ether_addr(dest)) {
-               if (br_multicast_rcv(br, NULL, skb))
 +              if (unlikely(netpoll_tx_running(dev))) {
 +                      br_flood_deliver(br, skb);
 +                      goto out;
 +              }
+               if (br_multicast_rcv(br, NULL, skb)) {
+                       kfree_skb(skb);
                        goto out;
+               }
  
                mdst = br_mdb_get(br, skb);
                if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))

diff --cc net/bridge/br_fdb.c
Simple merge

diff --cc net/bridge/br_input.c
index 5fc1c5b1c36054dcd4b44c521691429c1bc6b167,114365c9eb1cfc6da53c0b48987086bacc0e7c65..826cd5221536cadd3b0d13dfec2e9d3639b92a93
--- 1/net/bridge/br_input.c
--- 2/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@@ -110,12 -108,13 +110,12 @@@ drop
        goto out;
  }
  
- /* note: already called with rcu_read_lock (preempt_disabled) */
+ /* note: already called with rcu_read_lock */
  static int br_handle_local_finish(struct sk_buff *skb)
  {
 -      struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
 +      struct net_bridge_port *p = br_port_get_rcu(skb->dev);
  
 -      if (p)
 -              br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
 +      br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
        return 0;        /* process further */
  }
  
@@@ -132,13 -131,12 +132,12 @@@ static inline int is_link_local(const u
  }
  
  /*
 - * Called via br_handle_frame_hook.
   * Return NULL if skb is handled
-  * note: already called with rcu_read_lock (preempt_disabled) from
-  * netif_receive_skb
+  * note: already called with rcu_read_lock
   */
 -struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 +struct sk_buff *br_handle_frame(struct sk_buff *skb)
  {
 +      struct net_bridge_port *p;
        const unsigned char *dest = eth_hdr(skb)->h_dest;
        int (*rhook)(struct sk_buff *skb);
  

diff --cc net/bridge/br_stp_bpdu.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/sched/act_nat.c
Simple merge