diff options
Diffstat (limited to 'net/ethernet')
-rw-r--r-- | net/ethernet/eth.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index 44d2b42fda5..a2468363978 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
@@ -231,11 +231,11 @@ EXPORT_SYMBOL(eth_header_parse); | |||
231 | * eth_header_cache - fill cache entry from neighbour | 231 | * eth_header_cache - fill cache entry from neighbour |
232 | * @neigh: source neighbour | 232 | * @neigh: source neighbour |
233 | * @hh: destination cache entry | 233 | * @hh: destination cache entry |
234 | * @type: Ethernet type field | ||
234 | * Create an Ethernet header template from the neighbour. | 235 | * Create an Ethernet header template from the neighbour. |
235 | */ | 236 | */ |
236 | int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh) | 237 | int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type) |
237 | { | 238 | { |
238 | __be16 type = hh->hh_type; | ||
239 | struct ethhdr *eth; | 239 | struct ethhdr *eth; |
240 | const struct net_device *dev = neigh->dev; | 240 | const struct net_device *dev = neigh->dev; |
241 | 241 | ||
@@ -340,6 +340,7 @@ void ether_setup(struct net_device *dev) | |||
340 | dev->addr_len = ETH_ALEN; | 340 | dev->addr_len = ETH_ALEN; |
341 | dev->tx_queue_len = 1000; /* Ethernet wants good queues */ | 341 | dev->tx_queue_len = 1000; /* Ethernet wants good queues */ |
342 | dev->flags = IFF_BROADCAST|IFF_MULTICAST; | 342 | dev->flags = IFF_BROADCAST|IFF_MULTICAST; |
343 | dev->priv_flags |= IFF_TX_SKB_SHARING; | ||
343 | 344 | ||
344 | memset(dev->broadcast, 0xFF, ETH_ALEN); | 345 | memset(dev->broadcast, 0xFF, ETH_ALEN); |
345 | 346 | ||