diff options
Diffstat (limited to 'drivers/net/ethernet/chelsio')
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/sge.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/sge.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c index f85e0659432b..8061fb0ef7ed 100644 --- a/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb/sge.c | |||
@@ -1386,7 +1386,7 @@ static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len) | |||
1386 | 1386 | ||
1387 | if (p->vlan_valid) { | 1387 | if (p->vlan_valid) { |
1388 | st->vlan_xtract++; | 1388 | st->vlan_xtract++; |
1389 | __vlan_hwaccel_put_tag(skb, ntohs(p->vlan)); | 1389 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(p->vlan)); |
1390 | } | 1390 | } |
1391 | netif_receive_skb(skb); | 1391 | netif_receive_skb(skb); |
1392 | } | 1392 | } |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c index 9d67eb794c4b..f12e6b85a653 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c | |||
@@ -2030,7 +2030,7 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq, | |||
2030 | 2030 | ||
2031 | if (p->vlan_valid) { | 2031 | if (p->vlan_valid) { |
2032 | qs->port_stats[SGE_PSTAT_VLANEX]++; | 2032 | qs->port_stats[SGE_PSTAT_VLANEX]++; |
2033 | __vlan_hwaccel_put_tag(skb, ntohs(p->vlan)); | 2033 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(p->vlan)); |
2034 | } | 2034 | } |
2035 | if (rq->polling) { | 2035 | if (rq->polling) { |
2036 | if (lro) | 2036 | if (lro) |
@@ -2132,7 +2132,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs, | |||
2132 | 2132 | ||
2133 | if (cpl->vlan_valid) { | 2133 | if (cpl->vlan_valid) { |
2134 | qs->port_stats[SGE_PSTAT_VLANEX]++; | 2134 | qs->port_stats[SGE_PSTAT_VLANEX]++; |
2135 | __vlan_hwaccel_put_tag(skb, ntohs(cpl->vlan)); | 2135 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(cpl->vlan)); |
2136 | } | 2136 | } |
2137 | napi_gro_frags(&qs->napi); | 2137 | napi_gro_frags(&qs->napi); |
2138 | } | 2138 | } |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c index 8b47b253e204..2bfbb206b35a 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c | |||
@@ -1633,7 +1633,7 @@ static void do_gro(struct sge_eth_rxq *rxq, const struct pkt_gl *gl, | |||
1633 | skb->rxhash = (__force u32)pkt->rsshdr.hash_val; | 1633 | skb->rxhash = (__force u32)pkt->rsshdr.hash_val; |
1634 | 1634 | ||
1635 | if (unlikely(pkt->vlan_ex)) { | 1635 | if (unlikely(pkt->vlan_ex)) { |
1636 | __vlan_hwaccel_put_tag(skb, ntohs(pkt->vlan)); | 1636 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(pkt->vlan)); |
1637 | rxq->stats.vlan_ex++; | 1637 | rxq->stats.vlan_ex++; |
1638 | } | 1638 | } |
1639 | ret = napi_gro_frags(&rxq->rspq.napi); | 1639 | ret = napi_gro_frags(&rxq->rspq.napi); |
@@ -1705,7 +1705,7 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, | |||
1705 | skb_checksum_none_assert(skb); | 1705 | skb_checksum_none_assert(skb); |
1706 | 1706 | ||
1707 | if (unlikely(pkt->vlan_ex)) { | 1707 | if (unlikely(pkt->vlan_ex)) { |
1708 | __vlan_hwaccel_put_tag(skb, ntohs(pkt->vlan)); | 1708 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ntohs(pkt->vlan)); |
1709 | rxq->stats.vlan_ex++; | 1709 | rxq->stats.vlan_ex++; |
1710 | } | 1710 | } |
1711 | netif_receive_skb(skb); | 1711 | netif_receive_skb(skb); |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index 61dfb2a47929..df296af20bd5 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c | |||
@@ -1482,7 +1482,8 @@ static void do_gro(struct sge_eth_rxq *rxq, const struct pkt_gl *gl, | |||
1482 | skb_record_rx_queue(skb, rxq->rspq.idx); | 1482 | skb_record_rx_queue(skb, rxq->rspq.idx); |
1483 | 1483 | ||
1484 | if (pkt->vlan_ex) { | 1484 | if (pkt->vlan_ex) { |
1485 | __vlan_hwaccel_put_tag(skb, be16_to_cpu(pkt->vlan)); | 1485 | __vlan_hwaccel_put_tag(skb, cpu_to_be16(ETH_P_8021Q), |
1486 | be16_to_cpu(pkt->vlan)); | ||
1486 | rxq->stats.vlan_ex++; | 1487 | rxq->stats.vlan_ex++; |
1487 | } | 1488 | } |
1488 | ret = napi_gro_frags(&rxq->rspq.napi); | 1489 | ret = napi_gro_frags(&rxq->rspq.napi); |
@@ -1551,7 +1552,7 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp, | |||
1551 | 1552 | ||
1552 | if (pkt->vlan_ex) { | 1553 | if (pkt->vlan_ex) { |
1553 | rxq->stats.vlan_ex++; | 1554 | rxq->stats.vlan_ex++; |
1554 | __vlan_hwaccel_put_tag(skb, be16_to_cpu(pkt->vlan)); | 1555 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(pkt->vlan)); |
1555 | } | 1556 | } |
1556 | 1557 | ||
1557 | netif_receive_skb(skb); | 1558 | netif_receive_skb(skb); |