Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 BNEP implementation for Linux Bluetooth stack (BlueZ). 2 BNEP implementation for Linux Bluetooth stack (BlueZ).
3 Copyright (C) 2001-2002 Inventel Systemes 3 Copyright (C) 2001-2002 Inventel Systemes
4 Written 2001-2002 by 4 Written 2001-2002 by
5 Clément Moreau <clement.moreau@inventel.fr> 5 Clément Moreau <clement.moreau@inventel.fr>
6 David Libault <david.libault@inventel.fr> 6 David Libault <david.libault@inventel.fr>
7 7
8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
9 9
10 This program is free software; you can redistribute it and/or modify 10 This program is free software; you can redistribute it and/or modify
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 if (proto >= f[i].start && proto <= f[i].end) 169 if (proto >= f[i].start && proto <= f[i].end)
170 return 0; 170 return 0;
171 } 171 }
172 172
173 BT_DBG("BNEP: filtered skb %p, proto 0x%.4x", skb, proto); 173 BT_DBG("BNEP: filtered skb %p, proto 0x%.4x", skb, proto);
174 return 1; 174 return 1;
175 } 175 }
176 #endif 176 #endif
177 177
178 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) 178 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
179 static netdev_tx_t bnep_net_xmit(struct sk_buff *skb, struct net_device *dev) 179 static netdev_tx_t bnep_net_xmit(struct sk_buff *skb,
180 » » » » struct net_device *dev)
180 #else 181 #else
181 static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev) 182 static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)
182 #endif 183 #endif
183
184 { 184 {
185 struct bnep_session *s = netdev_priv(dev); 185 struct bnep_session *s = netdev_priv(dev);
186 struct sock *sk = s->sock->sk; 186 struct sock *sk = s->sock->sk;
187 187
188 BT_DBG("skb %p, dev %p", skb, dev); 188 BT_DBG("skb %p, dev %p", skb, dev);
189 189
190 #ifdef CONFIG_BT_BNEP_MC_FILTER 190 #ifdef CONFIG_BT_BNEP_MC_FILTER
191 if (bnep_net_mc_filter(skb, s)) { 191 if (bnep_net_mc_filter(skb, s)) {
192 kfree_skb(skb); 192 kfree_skb(skb);
193 return NETDEV_TX_OK; 193 return NETDEV_TX_OK;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 { 237 {
238 238
239 memset(dev->broadcast, 0xff, ETH_ALEN); 239 memset(dev->broadcast, 0xff, ETH_ALEN);
240 dev->addr_len = ETH_ALEN; 240 dev->addr_len = ETH_ALEN;
241 241
242 ether_setup(dev); 242 ether_setup(dev);
243 netdev_attach_ops(dev, &bnep_netdev_ops); 243 netdev_attach_ops(dev, &bnep_netdev_ops);
244 244
245 dev->watchdog_timeo = HZ * 2; 245 dev->watchdog_timeo = HZ * 2;
246 } 246 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698