vlan.c (c94f28c383f58c9de74678e0f1624db9c5f8a8cb) vlan.c (029f5fc31cdb35d6c8a7fe9a54bf21556e175988)
1/*
2 * INET 802.1Q VLAN
3 * Ethernet-type device handling.
4 *
5 * Authors: Ben Greear <greearb@candelatech.com>
6 * Please send support related email to: netdev@vger.kernel.org
7 * VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
8 *

--- 320 unchanged lines hidden (view full) ---

329static void vlan_transfer_features(struct net_device *dev,
330 struct net_device *vlandev)
331{
332 unsigned long old_features = vlandev->features;
333
334 vlandev->features &= ~dev->vlan_features;
335 vlandev->features |= dev->features & dev->vlan_features;
336 vlandev->gso_max_size = dev->gso_max_size;
1/*
2 * INET 802.1Q VLAN
3 * Ethernet-type device handling.
4 *
5 * Authors: Ben Greear <greearb@candelatech.com>
6 * Please send support related email to: netdev@vger.kernel.org
7 * VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
8 *

--- 320 unchanged lines hidden (view full) ---

329static void vlan_transfer_features(struct net_device *dev,
330 struct net_device *vlandev)
331{
332 unsigned long old_features = vlandev->features;
333
334 vlandev->features &= ~dev->vlan_features;
335 vlandev->features |= dev->features & dev->vlan_features;
336 vlandev->gso_max_size = dev->gso_max_size;
337
338 if (dev->features & NETIF_F_HW_VLAN_TX)
339 vlandev->hard_header_len = dev->hard_header_len;
340 else
341 vlandev->hard_header_len = dev->hard_header_len + VLAN_HLEN;
342
337#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
338 vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid;
339#endif
340 vlandev->real_num_tx_queues = dev->real_num_tx_queues;
341 BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues);
342
343 if (old_features != vlandev->features)
344 netdev_features_change(vlandev);

--- 379 unchanged lines hidden --- 		343#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
344 vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid;
345#endif
346 vlandev->real_num_tx_queues = dev->real_num_tx_queues;
347 BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues);
348
349 if (old_features != vlandev->features)
350 netdev_features_change(vlandev);

--- 379 unchanged lines hidden ---