1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index f01cfdb995de..58380d240619 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -54,6 +54,7 @@
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/slab.h>
+#include <linux/prefetch.h>
 
 #include "cpl5_cmd.h"
 #include "sge.h"
@@ -273,6 +274,10 @@ struct sge {
         struct cmdQ cmdQ[SGE_CMDQ_N] ____cacheline_aligned_in_smp;
 };
 
+static const u8 ch_mac_addr[ETH_ALEN] = {
+        0x0, 0x7, 0x43, 0x0, 0x0, 0x0
+};
+
 /*
  * stop tasklet and free all pending skb's
  */
@@ -925,7 +930,7 @@ void t1_sge_intr_enable(struct sge *sge)
         u32 en = SGE_INT_ENABLE;
         u32 val = readl(sge->adapter->regs + A_PL_ENABLE);
 
-        if (sge->adapter->flags & TSO_CAPABLE)
+        if (sge->adapter->port[0].dev->hw_features & NETIF_F_TSO)
                 en &= ~F_PACKET_TOO_BIG;
         writel(en, sge->adapter->regs + A_SG_INT_ENABLE);
         writel(val | SGE_PL_INTR_MASK, sge->adapter->regs + A_PL_ENABLE);
@@ -948,7 +953,7 @@ int t1_sge_intr_error_handler(struct sge *sge)
         struct adapter *adapter = sge->adapter;
         u32 cause = readl(adapter->regs + A_SG_INT_CAUSE);
 
-        if (adapter->flags & TSO_CAPABLE)
+        if (adapter->port[0].dev->hw_features & NETIF_F_TSO)
                 cause &= ~F_PACKET_TOO_BIG;
         if (cause & F_RESPQ_EXHAUSTED)
                 sge->stats.respQ_empty++;
@@ -1365,6 +1370,7 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
         const struct cpl_rx_pkt *p;
         struct adapter *adapter = sge->adapter;
         struct sge_port_stats *st;
+        struct net_device *dev;
 
         skb = get_packet(adapter->pdev, fl, len - sge->rx_pkt_pad);
         if (unlikely(!skb)) {
@@ -1380,15 +1386,16 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)
         __skb_pull(skb, sizeof(*p));
 
         st = this_cpu_ptr(sge->port_stats[p->iff]);
+        dev = adapter->port[p->iff].dev;
 
-        skb->protocol = eth_type_trans(skb, adapter->port[p->iff].dev);
-        if ((adapter->flags & RX_CSUM_ENABLED) && p->csum == 0xffff &&
+        skb->protocol = eth_type_trans(skb, dev);
+        if ((dev->features & NETIF_F_RXCSUM) && p->csum == 0xffff &&
             skb->protocol == htons(ETH_P_IP) &&
             (skb->data[9] == IPPROTO_TCP || skb->data[9] == IPPROTO_UDP)) {
                 ++st->rx_cso_good;
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         } else
-                skb->ip_summed = CHECKSUM_NONE;
+                skb_checksum_none_assert(skb);
 
         if (unlikely(adapter->vlan_grp && p->vlan_valid)) {
                 st->vlan_xtract++;
@@ -1551,7 +1558,7 @@ static inline int responses_pending(const struct adapter *adapter)
         const struct respQ *Q = &adapter->sge->respQ;
         const struct respQ_e *e = &Q->entries[Q->cidx];
 
-        return (e->GenerationBit == Q->genbit);
+        return e->GenerationBit == Q->genbit;
 }
 
 /*
@@ -1658,7 +1665,7 @@ irqreturn_t t1_interrupt(int irq, void *data)
  * The code figures out how many entries the sk_buff will require in the
  * cmdQ and updates the cmdQ data structure with the state once the enqueue
  * has complete. Then, it doesn't access the global structure anymore, but
- * uses the corresponding fields on the stack. In conjuction with a spinlock
+ * uses the corresponding fields on the stack. In conjunction with a spinlock
  * around that code, we can make the function reentrant without holding the
  * lock when we actually enqueue (which might be expensive, especially on
  * architectures with IO MMUs).
@@ -1834,8 +1841,7 @@ netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                         return NETDEV_TX_OK;
                 }
 
-                if (!(adapter->flags & UDP_CSUM_CAPABLE) &&
-                    skb->ip_summed == CHECKSUM_PARTIAL &&
+                if (skb->ip_summed == CHECKSUM_PARTIAL &&
                     ip_hdr(skb)->protocol == IPPROTO_UDP) {
                         if (unlikely(skb_checksum_help(skb))) {
                                 pr_debug("%s: unable to do udp checksum\n", dev->name);
@@ -1870,7 +1876,7 @@ netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
         cpl->iff = dev->if_port;
 
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-        if (adapter->vlan_grp && vlan_tx_tag_present(skb)) {
+        if (vlan_tx_tag_present(skb)) {
                 cpl->vlan_valid = 1;
                 cpl->vlan = htons(vlan_tx_tag_get(skb));
                 st->vlan_insert++;
@@ -2012,10 +2018,6 @@ static void espibug_workaround_t204(unsigned long data)
                                 continue;
 
                         if (!skb->cb[0]) {
-                                u8 ch_mac_addr[ETH_ALEN] = {
-                                        0x0, 0x7, 0x43, 0x0, 0x0, 0x0
-                                };
-
                                 skb_copy_to_linear_data_offset(skb,
                                                     sizeof(struct cpl_tx_pkt),
                                                                ch_mac_addr,
@@ -2048,8 +2050,6 @@ static void espibug_workaround(unsigned long data)
 
                 if ((seop & 0xfff0fff) == 0xfff && skb) {
                         if (!skb->cb[0]) {
-                                u8 ch_mac_addr[ETH_ALEN] =
-                                    {0x0, 0x7, 0x43, 0x0, 0x0, 0x0};
                                 skb_copy_to_linear_data_offset(skb,
                                                      sizeof(struct cpl_tx_pkt),
                                                                ch_mac_addr,