diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-10 04:09:55 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-10 04:09:55 +0100 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /drivers/net/usb/qmi_wwan.c | |
| parent | macvlan: fix memory hole in macvlan_dev (diff) | |
| parent | kmemcheck: rip it out for real (diff) | |
| download | linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.xz linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/qmi_wwan.c')
| -rw-r--r-- | drivers/net/usb/qmi_wwan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index c750cf7c042b..304ec6555cd8 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -261,9 +261,11 @@ static void qmi_wwan_netdev_setup(struct net_device *net) net->hard_header_len = 0; net->addr_len = 0; net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; + set_bit(EVENT_NO_IP_ALIGN, &dev->flags); netdev_dbg(net, "mode: raw IP\n"); } else if (!net->header_ops) { /* don't bother if already set */ ether_setup(net); + clear_bit(EVENT_NO_IP_ALIGN, &dev->flags); netdev_dbg(net, "mode: Ethernet\n"); } |