git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
bluetooth
/
bnep
/
netdev.c
diff --git
a/net/bluetooth/bnep/netdev.c
b/net/bluetooth/bnep/netdev.c
index
921204f
..
67a002a
100644
(file)
--- a/
net/bluetooth/bnep/netdev.c
+++ b/
net/bluetooth/bnep/netdev.c
@@
-29,7
+29,6
@@
* $Id: netdev.c,v 1.8 2002/08/04 21:23:58 maxk Exp $
*/
* $Id: netdev.c,v 1.8 2002/08/04 21:23:58 maxk Exp $
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/socket.h>
#include <linux/module.h>
#include <linux/socket.h>
@@
-159,14
+158,15
@@
static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
{
struct ethhdr *eh = (void *) skb->data;
static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
{
struct ethhdr *eh = (void *) skb->data;
+ u16 proto = ntohs(eh->h_proto);
- if (
ntohs(eh->h_proto)
>= 1536)
- return
eh->h_
proto;
+ if (
proto
>= 1536)
+ return proto;
- if (get_unaligned((
u16 *) skb->data) == 0xFFFF
)
- return
htons(ETH_P_802_3)
;
+ if (get_unaligned((
__be16 *) skb->data) == htons(0xFFFF)
)
+ return
ETH_P_802_3
;
- return
htons(ETH_P_802_2)
;
+ return
ETH_P_802_2
;
}
static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
}
static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)