diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/e1000e/netdev.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index a39d4a4d871c..506a0a0043b3 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -4886,7 +4886,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, | |||
| 4886 | if (skb->protocol == htons(ETH_P_IP)) | 4886 | if (skb->protocol == htons(ETH_P_IP)) |
| 4887 | tx_flags |= E1000_TX_FLAGS_IPV4; | 4887 | tx_flags |= E1000_TX_FLAGS_IPV4; |
| 4888 | 4888 | ||
| 4889 | /* if count is 0 then mapping error has occured */ | 4889 | /* if count is 0 then mapping error has occurred */ |
| 4890 | count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss); | 4890 | count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss); |
| 4891 | if (count) { | 4891 | if (count) { |
| 4892 | e1000_tx_queue(adapter, tx_flags, count); | 4892 | e1000_tx_queue(adapter, tx_flags, count); |