Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175608
b: refs/heads/master
c: e1187b3
h: refs/heads/master
v: v3
  • Loading branch information
Ajit Khaparde authored and David S. Miller committed Dec 12, 2009
1 parent ce23bb4 commit fa337d0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7227909340477c1e5225bb2df76cdcc95b5e1da1
refs/heads/master: e1187b3be72be59625e445b186007e6eae27fef1
4 changes: 2 additions & 2 deletions trunk/drivers/net/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,

/* vlanf could be wrongly set in some cards.
* ignore if vtm is not set */
if ((adapter->cap == 0x400) && !vtm)
if ((adapter->cap & 0x400) && !vtm)
vlanf = 0;

skb = netdev_alloc_skb_ip_align(adapter->netdev, BE_HDR_LEN);
Expand Down Expand Up @@ -816,7 +816,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,

/* vlanf could be wrongly set in some cards.
* ignore if vtm is not set */
if ((adapter->cap == 0x400) && !vtm)
if ((adapter->cap & 0x400) && !vtm)
vlanf = 0;

skb = napi_get_frags(&eq_obj->napi);
Expand Down

0 comments on commit fa337d0

Please sign in to comment.