diff options
Diffstat (limited to 'net/bluetooth/bnep')
-rw-r--r-- | net/bluetooth/bnep/netdev.c | 2 | ||||
-rw-r--r-- | net/bluetooth/bnep/sock.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index e58c8b32589c..4b488ec26105 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
@@ -136,7 +136,7 @@ static u16 bnep_net_eth_proto(struct sk_buff *skb) | |||
136 | struct ethhdr *eh = (void *) skb->data; | 136 | struct ethhdr *eh = (void *) skb->data; |
137 | u16 proto = ntohs(eh->h_proto); | 137 | u16 proto = ntohs(eh->h_proto); |
138 | 138 | ||
139 | if (proto >= 1536) | 139 | if (proto >= ETH_P_802_3_MIN) |
140 | return proto; | 140 | return proto; |
141 | 141 | ||
142 | if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF)) | 142 | if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF)) |
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c index d4686fb7e957..5f051290daba 100644 --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c | |||
@@ -253,8 +253,6 @@ error: | |||
253 | void __exit bnep_sock_cleanup(void) | 253 | void __exit bnep_sock_cleanup(void) |
254 | { | 254 | { |
255 | bt_procfs_cleanup(&init_net, "bnep"); | 255 | bt_procfs_cleanup(&init_net, "bnep"); |
256 | if (bt_sock_unregister(BTPROTO_BNEP) < 0) | 256 | bt_sock_unregister(BTPROTO_BNEP); |
257 | BT_ERR("Can't unregister BNEP socket"); | ||
258 | |||
259 | proto_unregister(&bnep_proto); | 257 | proto_unregister(&bnep_proto); |
260 | } | 258 | } |