“8795ca61e4ff3db70f2d072a28aaefc29f1a2301”上不存在“drivers/net/wireless/marvell/mwifiex/sta_ioctl.c”
提交 ba4e6d19 编写于 作者: F françois romieu 提交者: David S. Miller

jme: remove open-coded skb_cow_head.

Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
Cc: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d8e4435e
...@@ -2053,19 +2053,6 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) ...@@ -2053,19 +2053,6 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx)
} }
static int
jme_expand_header(struct jme_adapter *jme, struct sk_buff *skb)
{
if (unlikely(skb_shinfo(skb)->gso_size &&
skb_header_cloned(skb) &&
pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) {
dev_kfree_skb_any(skb);
return -1;
}
return 0;
}
static int static int
jme_tx_tso(struct sk_buff *skb, __le16 *mss, u8 *flags) jme_tx_tso(struct sk_buff *skb, __le16 *mss, u8 *flags)
{ {
...@@ -2225,7 +2212,8 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev) ...@@ -2225,7 +2212,8 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)
struct jme_adapter *jme = netdev_priv(netdev); struct jme_adapter *jme = netdev_priv(netdev);
int idx; int idx;
if (unlikely(jme_expand_header(jme, skb))) { if (unlikely(skb_is_gso(skb) && skb_cow_head(skb, 0))) {
dev_kfree_skb_any(skb);
++(NET_STAT(jme).tx_dropped); ++(NET_STAT(jme).tx_dropped);
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册