6 files changed, 30 insertions, 47 deletions

diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 6ff356d4c7ab..fe08a004b0dd 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -67,32 +67,6 @@
 /* Additional NETIF_MSG_* categories */
 #define NETIF_MSG_MMIO 0x8000000
 
-struct t3_rx_mode {
-        struct net_device *dev;
-        struct dev_mc_list *mclist;
-        unsigned int idx;
-};
-
-static inline void init_rx_mode(struct t3_rx_mode *p, struct net_device *dev,
-                                struct dev_mc_list *mclist)
-{
-        p->dev = dev;
-        p->mclist = mclist;
-        p->idx = 0;
-}
-
-static inline u8 *t3_get_next_mcaddr(struct t3_rx_mode *rm)
-{
-        u8 *addr = NULL;
-
-        if (rm->mclist && rm->idx < rm->dev->mc_count) {
-                addr = rm->mclist->dmi_addr;
-                rm->mclist = rm->mclist->next;
-                rm->idx++;
-        }
-        return addr;
-}
-
 enum {
         MAX_NPORTS = 2,         /* max # of ports */
         MAX_FRAME_SIZE = 10240, /* max MAC frame size, including header + FCS */
@@ -746,7 +720,7 @@ void t3_mac_enable_exact_filters(struct cmac *mac);
 int t3_mac_enable(struct cmac *mac, int which);
 int t3_mac_disable(struct cmac *mac, int which);
 int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu);
-int t3_mac_set_rx_mode(struct cmac *mac, struct t3_rx_mode *rm);
+int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev);
 int t3_mac_set_address(struct cmac *mac, unsigned int idx, u8 addr[6]);
 int t3_mac_set_num_ucast(struct cmac *mac, int n);
 const struct mac_stats *t3_mac_update_stats(struct cmac *mac);
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 37945fce7fa5..3e453e1d97e7 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -81,7 +81,7 @@ enum {
 #define CH_DEVICE(devid, idx) \
         { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx }
 
-static const struct pci_device_id cxgb3_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(cxgb3_pci_tbl) = {
         CH_DEVICE(0x20, 0),     /* PE9000 */
         CH_DEVICE(0x21, 1),     /* T302E */
         CH_DEVICE(0x22, 2),     /* T310E */
@@ -325,11 +325,9 @@ void t3_os_phymod_changed(struct adapter *adap, int port_id)
 
 static void cxgb_set_rxmode(struct net_device *dev)
 {
-        struct t3_rx_mode rm;
         struct port_info *pi = netdev_priv(dev);
 
-        init_rx_mode(&rm, dev, dev->mc_list);
-        t3_mac_set_rx_mode(&pi->mac, &rm);
+        t3_mac_set_rx_mode(&pi->mac, dev);
 }
 
 /**
@@ -340,17 +338,15 @@ static void cxgb_set_rxmode(struct net_device *dev)
  */
 static void link_start(struct net_device *dev)
 {
-        struct t3_rx_mode rm;
         struct port_info *pi = netdev_priv(dev);
         struct cmac *mac = &pi->mac;
 
-        init_rx_mode(&rm, dev, dev->mc_list);
         t3_mac_reset(mac);
         t3_mac_set_num_ucast(mac, MAX_MAC_IDX);
         t3_mac_set_mtu(mac, dev->mtu);
         t3_mac_set_address(mac, LAN_MAC_IDX, dev->dev_addr);
         t3_mac_set_address(mac, SAN_MAC_IDX, pi->iscsic.mac_addr);
-        t3_mac_set_rx_mode(mac, &rm);
+        t3_mac_set_rx_mode(mac, dev);
         t3_link_start(&pi->phy, mac, &pi->link_config);
         t3_mac_enable(mac, MAC_DIRECTION_RX | MAC_DIRECTION_TX);
 }
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c
index 75064eea1d87..9498361119d6 100644
--- a/drivers/net/cxgb3/cxgb3_offload.c
+++ b/drivers/net/cxgb3/cxgb3_offload.c
@@ -1252,7 +1252,7 @@ int cxgb3_offload_activate(struct adapter *adapter)
         struct mtutab mtutab;
         unsigned int l2t_capacity;
 
-        t = kcalloc(1, sizeof(*t), GFP_KERNEL);
+        t = kzalloc(sizeof(*t), GFP_KERNEL);
         if (!t)
                 return -ENOMEM;
 
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 9b434461c4f1..78e265b484b6 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -481,6 +481,7 @@ static inline void ring_fl_db(struct adapter *adap, struct sge_fl *q)
 {
         if (q->pend_cred >= q->credits / 4) {
                 q->pend_cred = 0;
+                wmb();
                 t3_write_reg(adap, A_SG_KDOORBELL, V_EGRCNTX(q->cntxt_id));
         }
 }
@@ -2287,11 +2288,14 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
         while (likely(budget_left && is_new_response(r, q))) {
                 int packet_complete, eth, ethpad = 2, lro = qs->lro_enabled;
                 struct sk_buff *skb = NULL;
-                u32 len, flags = ntohl(r->flags);
-                __be32 rss_hi = *(const __be32 *)r,
-                       rss_lo = r->rss_hdr.rss_hash_val;
+                u32 len, flags;
+                __be32 rss_hi, rss_lo;
 
+                rmb();
                 eth = r->rss_hdr.opcode == CPL_RX_PKT;
+                rss_hi = *(const __be32 *)r;
+                rss_lo = r->rss_hdr.rss_hash_val;
+                flags = ntohl(r->flags);
 
                 if (unlikely(flags & F_RSPD_ASYNC_NOTIF)) {
                         skb = alloc_skb(AN_PKT_SIZE, GFP_ATOMIC);
@@ -2502,7 +2506,10 @@ static int process_pure_responses(struct adapter *adap, struct sge_qset *qs,
                         refill_rspq(adap, q, q->credits);
                         q->credits = 0;
                 }
-        } while (is_new_response(r, q) && is_pure_response(r));
+                if (!is_new_response(r, q))
+                        break;
+                rmb();
+        } while (is_pure_response(r));
 
         if (sleeping)
                 check_ring_db(adap, qs, sleeping);
@@ -2536,6 +2543,7 @@ static inline int handle_responses(struct adapter *adap, struct sge_rspq *q)
 
         if (!is_new_response(r, q))
                 return -1;
+        rmb();
         if (is_pure_response(r) && process_pure_responses(adap, qs, r) == 0) {
                 t3_write_reg(adap, A_SG_GTS, V_RSPQ(q->cntxt_id) |
                              V_NEWTIMER(q->holdoff_tmr) | V_NEWINDEX(q->cidx));
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index c38fc717a0d1..95a8ba0759f1 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1262,7 +1262,8 @@ void t3_link_changed(struct adapter *adapter, int port_id)
                 lc->fc = fc;
         }
 
-        t3_os_link_changed(adapter, port_id, link_ok, speed, duplex, fc);
+        t3_os_link_changed(adapter, port_id, link_ok && !pi->link_fault,
+                           speed, duplex, fc);
 }
 
 void t3_link_fault(struct adapter *adapter, int port_id)
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index 0109ee4f2f91..c142a2132e9f 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -297,29 +297,30 @@ static int hash_hw_addr(const u8 * addr)
         return hash;
 }
 
-int t3_mac_set_rx_mode(struct cmac *mac, struct t3_rx_mode *rm)
+int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev)
 {
         u32 val, hash_lo, hash_hi;
         struct adapter *adap = mac->adapter;
         unsigned int oft = mac->offset;
 
         val = t3_read_reg(adap, A_XGM_RX_CFG + oft) & ~F_COPYALLFRAMES;
-        if (rm->dev->flags & IFF_PROMISC)
+        if (dev->flags & IFF_PROMISC)
                 val |= F_COPYALLFRAMES;
         t3_write_reg(adap, A_XGM_RX_CFG + oft, val);
 
-        if (rm->dev->flags & IFF_ALLMULTI)
+        if (dev->flags & IFF_ALLMULTI)
                 hash_lo = hash_hi = 0xffffffff;
         else {
-                u8 *addr;
+                struct dev_mc_list *dmi;
                 int exact_addr_idx = mac->nucast;
 
                 hash_lo = hash_hi = 0;
-                while ((addr = t3_get_next_mcaddr(rm)))
+                netdev_for_each_mc_addr(dmi, dev)
                         if (exact_addr_idx < EXACT_ADDR_FILTERS)
-                                set_addr_filter(mac, exact_addr_idx++, addr);
+                                set_addr_filter(mac, exact_addr_idx++,
+                                                dmi->dmi_addr);
                         else {
-                                int hash = hash_hw_addr(addr);
+                                int hash = hash_hw_addr(dmi->dmi_addr);
 
                                 if (hash < 32)
                                         hash_lo |= (1 << hash);
@@ -353,6 +354,9 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu)
          * packet size register includes header, but not FCS.
          */
         mtu += 14;
+        if (mtu > 1536)
+                mtu += 4;
+
         if (mtu > MAX_FRAME_SIZE - 4)
                 return -EINVAL;
         t3_write_reg(adap, A_XGM_RX_MAX_PKT_SIZE + mac->offset, mtu);