diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:23:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:23:21 -0400 |
| commit | ce8c2293be47999584908069e78bf6d94beadc53 (patch) | |
| tree | dfd6909e6866998d2103341b1e1af8c129d0cea8 /net/bluetooth | |
| parent | 41e9d344bf52c57ec16648d08618b61d3f1d4bdc (diff) | |
| parent | ee6a99b539a50b4e9398938a0a6d37f8bf911550 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
[TG3]: Fix msi issue with kexec/kdump.
[NET] XFRM: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
[NET] ROSE: Fix whitespace errors.
[NET] RFKILL: Fix whitespace errors.
[NET] PACKET: Fix whitespace errors.
[NET] NETROM: Fix whitespace errors.
[NET] NETFILTER: Fix whitespace errors.
[NET] IPV4: Fix whitespace errors.
[NET] DCCP: Fix whitespace errors.
[NET] CORE: Fix whitespace errors.
[NET] BLUETOOTH: Fix whitespace errors.
[NET] AX25: Fix whitespace errors.
[PATCH] mac80211: remove rtnl locking in ieee80211_sta.c
[PATCH] mac80211: fix GCC warning on 64bit platforms
[GENETLINK]: Dynamic multicast groups.
[NETLIKN]: Allow removing multicast groups.
...
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index f6d867e0179f..63caa414945d 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -982,7 +982,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) | |||
| 982 | 982 | ||
| 983 | skb->dev = (void *) hdev; | 983 | skb->dev = (void *) hdev; |
| 984 | bt_cb(skb)->pkt_type = type; | 984 | bt_cb(skb)->pkt_type = type; |
| 985 | 985 | ||
| 986 | __reassembly(hdev, type) = skb; | 986 | __reassembly(hdev, type) = skb; |
| 987 | 987 | ||
| 988 | scb = (void *) skb->cb; | 988 | scb = (void *) skb->cb; |