diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-11 20:26:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-11 20:26:58 +0200 |
| commit | 3c709f8fb43e07a0403bba4a8ca7ba00ab874994 (patch) | |
| tree | 9efc1e2bf6930851f0224f525b6cde0f5297fa61 /drivers/net/benet/be.h | |
| parent | Merge branch 'tipc-May10-2011' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6 (diff) | |
| download | linux-3c709f8fb43e07a0403bba4a8ca7ba00ab874994.tar.xz linux-3c709f8fb43e07a0403bba4a8ca7ba00ab874994.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6
Conflicts:
drivers/net/benet/be_main.c
Diffstat (limited to 'drivers/net/benet/be.h')
| -rw-r--r-- | drivers/net/benet/be.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index a0b4743d7224..41bbc32123f8 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -212,7 +212,7 @@ struct be_rx_stats { struct be_rx_compl_info { u32 rss_hash; - u16 vid; + u16 vlan_tag; u16 pkt_size; u16 rxq_idx; u16 mac_id; |