diff --git a/[refs] b/[refs] index 1fbc127815e1..b3a0f130fc04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d1285beff2e8467b8c3884d83b7a91a99aa9fcd +refs/heads/master: bf18a9f8b32666cb6a4abd3e922c1b7e69735733 diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h index 82b45d8797b4..524691cd9896 100644 --- a/trunk/drivers/net/tg3.h +++ b/trunk/drivers/net/tg3.h @@ -2412,7 +2412,6 @@ struct ring_info { struct tx_ring_info { struct sk_buff *skb; - u32 prev_vlan_tag; }; struct tg3_config_info {