projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f64006
)
be2net: remove unnecessary usage of unlikely()
author
Sathya Perla
<
[email protected]
>
Tue, 5 Jun 2012 19:37:21 +0000
(19:37 +0000)
committer
David S. Miller
<
[email protected]
>
Wed, 6 Jun 2012 16:06:18 +0000
(09:06 -0700)
Signed-off-by: Sathya Perla <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/emulex/benet/be_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/emulex/benet/be_main.c
b/drivers/net/ethernet/emulex/benet/be_main.c
index 3aa478f5035807a044a59e7e4f6437eb94f93cca..42ee75b794b612936d11780087d3e6c86e72d6a9 100644
(file)
--- a/
drivers/net/ethernet/emulex/benet/be_main.c
+++ b/
drivers/net/ethernet/emulex/benet/be_main.c
@@
-719,8
+719,8
@@
static netdev_tx_t be_xmit(struct sk_buff *skb,
* 60 bytes long.
* As a workaround disable TX vlan offloading in such cases.
*/
- if (
unlikely(
vlan_tx_tag_present(skb) &&
-
(skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60)
)) {
+ if (vlan_tx_tag_present(skb) &&
+
(skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60
)) {
skb = skb_share_check(skb, GFP_ATOMIC);
if (unlikely(!skb))
goto tx_drop;