matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[knet] Pick up some Broadcom knet driver changes in 3.3 GA release

Browse Source 
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
This commit is contained in:
Ying Xie 2018-12-01 01:03:28 +00:00
parent 560d35bf42
commit 550a45c0fa
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
View File

@ -4417,7 +4417,8 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
}
} else {
if (sinfo->cmic_type == 'x' && priv->port >= 0) {
if (skb_header_cloned(skb) || skb_headroom(skb) < hdrlen + 4) {
if (skb_header_cloned(skb) || skb_headroom(skb) < hdrlen + 4 ||
((unsigned long)skb->data % 4)) {
/* Current SKB cannot be modified */
DBG_SKB(("Realloc Tx SKB\n"));
new_skb = dev_alloc_skb(pktlen + hdrlen + 4);
@ -4784,8 +4785,11 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
bkn_suspend_tx(sinfo);
}
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4,6,0))
dev->trans_start = jiffies;
#else
netif_trans_update(dev);
#endif
spin_unlock_irqrestore(&sinfo->lock, flags);
return 0;