diff options
author | David S. Miller <davem@davemloft.net> | 2005-08-09 22:34:12 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 18:32:25 -0400 |
commit | f2ccd8fa06c8e302116e71df372f5c1f83432e03 (patch) | |
tree | 6e933f4bdc8899009edb33642b908779f123fb4a /include/linux/skbuff.h | |
parent | b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 (diff) |
[NET]: Kill skb->real_dev
Bonding just wants the device before the skb_bond()
decapsulation occurs, so simply pass that original
device into packet_type->func() as an argument.
It remains to be seen whether we can use this same
exact thing to get rid of skb->input_dev as well.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index af4f02e98243..60b32151f76a 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -164,7 +164,6 @@ struct skb_shared_info { | |||
164 | * @stamp: Time we arrived | 164 | * @stamp: Time we arrived |
165 | * @dev: Device we arrived on/are leaving by | 165 | * @dev: Device we arrived on/are leaving by |
166 | * @input_dev: Device we arrived on | 166 | * @input_dev: Device we arrived on |
167 | * @real_dev: The real device we are using | ||
168 | * @h: Transport layer header | 167 | * @h: Transport layer header |
169 | * @nh: Network layer header | 168 | * @nh: Network layer header |
170 | * @mac: Link layer header | 169 | * @mac: Link layer header |
@@ -206,7 +205,6 @@ struct sk_buff { | |||
206 | struct timeval stamp; | 205 | struct timeval stamp; |
207 | struct net_device *dev; | 206 | struct net_device *dev; |
208 | struct net_device *input_dev; | 207 | struct net_device *input_dev; |
209 | struct net_device *real_dev; | ||
210 | 208 | ||
211 | union { | 209 | union { |
212 | struct tcphdr *th; | 210 | struct tcphdr *th; |