openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bcmgenet: fix bcmgenet_put_tx_csum() 

bcmgenet_put_tx_csum() needs to return skb pointer back to the caller
because it reallocates a new one in case of lack of skb headroom.

Signed-off-by: Petri Gynther <pgynther@google.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Petri Gynther 2014-10-01 11:30:01 -07:00 committed by David S. Miller
parent 38b2cf2982
commit bc23333ba1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/broadcom/genet/bcmgenet.c
View File

@ -1054,7 +1054,8 @@ static int bcmgenet_xmit_frag(struct net_device *dev,
/* Reallocate the SKB to put enough headroom in front of it and insert /* Reallocate the SKB to put enough headroom in front of it and insert
* the transmit checksum offsets in the descriptors * the transmit checksum offsets in the descriptors
*/ */
static int bcmgenet_put_tx_csum(struct net_device *dev, struct sk_buff *skb) static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,
struct sk_buff *skb)
{ {
struct status_64 *status = NULL; struct status_64 *status = NULL;
struct sk_buff *new_skb; struct sk_buff *new_skb;
@ -1072,7 +1073,7 @@ static int bcmgenet_put_tx_csum(struct net_device *dev, struct sk_buff *skb)
if (!new_skb) { if (!new_skb) {
dev->stats.tx_errors++; dev->stats.tx_errors++;
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
return -ENOMEM; return NULL;
} }
skb = new_skb; skb = new_skb;
} }
@ -1090,7 +1091,7 @@ static int bcmgenet_put_tx_csum(struct net_device *dev, struct sk_buff *skb)
ip_proto = ipv6_hdr(skb)->nexthdr; ip_proto = ipv6_hdr(skb)->nexthdr;
break; break;
default: default:
return 0; return skb;
} }
offset = skb_checksum_start_offset(skb) - sizeof(*status); offset = skb_checksum_start_offset(skb) - sizeof(*status);
@ -1111,7 +1112,7 @@ static int bcmgenet_put_tx_csum(struct net_device *dev, struct sk_buff *skb)
status->tx_csum_info = tx_csum_info; status->tx_csum_info = tx_csum_info;
} }
return 0; return skb;
} }
static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
@ -1158,8 +1159,8 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
/* set the SKB transmit checksum */ /* set the SKB transmit checksum */
if (priv->desc_64b_en) { if (priv->desc_64b_en) {
ret = bcmgenet_put_tx_csum(dev, skb); skb = bcmgenet_put_tx_csum(dev, skb);
if (ret) { if (!skb) {
ret = NETDEV_TX_OK; ret = NETDEV_TX_OK;
goto out; goto out;
} }