chromeos/compat-wireless/net/bluetooth/bnep/netdev.c - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/net/bluetooth/bnep/netdev.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/compat-wireless/net/bluetooth/bnep/netdev.c

diff --git a/chromeos/compat-wireless/net/bluetooth/bnep/netdev.c b/chromeos/compat-wireless/net/bluetooth/bnep/netdev.c

index e0753ef4ae6b7e82dd21ec64472be8a5eac02002..a1c9178bb37df13abd6343cbc155949bf09569e3 100644

--- a/chromeos/compat-wireless/net/bluetooth/bnep/netdev.c

+++ b/chromeos/compat-wireless/net/bluetooth/bnep/netdev.c

@@ -176,11 +176,11 @@ static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session

#endif

#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))

-static netdev_tx_t bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)

+static netdev_tx_t bnep_net_xmit(struct sk_buff *skb,

+ struct net_device *dev)

#else

static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)

#endif

{

struct bnep_session *s = netdev_priv(dev);

struct sock *sk = s->sock->sk;