mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
0ddead90b2
451 changed files with 3846 additions and 2246 deletions
|
|
@ -107,7 +107,7 @@ static void lowpan_setup(struct net_device *ldev)
|
|||
|
||||
ldev->netdev_ops = &lowpan_netdev_ops;
|
||||
ldev->header_ops = &lowpan_header_ops;
|
||||
ldev->destructor = free_netdev;
|
||||
ldev->needs_free_netdev = true;
|
||||
ldev->features |= NETIF_F_NETNS_LOCAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue