diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-26 16:09:39 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-26 16:09:39 -0700 |
| commit | b6b2fe5b6e956c8217a7584472a3ac5c068b61d4 (patch) | |
| tree | 899d38684e674a05fc3e4ae2885529b916583323 /net/ieee802154/6lowpan_rtnl.c | |
| parent | b52f4914f3be3ff50e7308e3ce03a2ce71195ecc (diff) | |
| parent | b9e742c3164344fece3615aca42ec51b41753908 (diff) | |
Merge tag 'tegra-clk-3.18' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next
Tegra clk updates for 3.18
Diffstat (limited to 'net/ieee802154/6lowpan_rtnl.c')
| -rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index 016b77ee88f0..6591d27e53a4 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c @@ -246,7 +246,7 @@ lowpan_alloc_frag(struct sk_buff *skb, int size, return ERR_PTR(-rc); } } else { - frag = ERR_PTR(ENOMEM); + frag = ERR_PTR(-ENOMEM); } return frag; @@ -437,7 +437,7 @@ static void lowpan_setup(struct net_device *dev) /* Frame Control + Sequence Number + Address fields + Security Header */ dev->hard_header_len = 2 + 1 + 20 + 14; dev->needed_tailroom = 2; /* FCS */ - dev->mtu = 1281; + dev->mtu = IPV6_MIN_MTU; dev->tx_queue_len = 0; dev->flags = IFF_BROADCAST | IFF_MULTICAST; dev->watchdog_timeo = 0; |