aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorMat Martineau <mathewm@codeaurora.org>2012-04-25 19:36:14 -0400
committerGustavo Padovan <gustavo@padovan.org>2012-05-09 00:40:47 -0400
commit3ce3514f5d0f90c7d856e8b0f26c6da393bbeba0 (patch)
tree0a32866b6d59bbfae27765a4c905c260501a2adc /include/net
parent5a364bd399d23fe6244de8f84c46f249b763c723 (diff)
Bluetooth: Remove duplicate structure members from bt_skb_cb
These values are now in the nested l2cap_ctrl struct. Signed-off-by: Mat Martineau <mathewm@codeaurora.org> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/bluetooth.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 27a6a936487d..2fb268f2895b 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -235,9 +235,6 @@ struct bt_skb_cb {
235 __u8 pkt_type; 235 __u8 pkt_type;
236 __u8 incoming; 236 __u8 incoming;
237 __u16 expect; 237 __u16 expect;
238 __u16 tx_seq;
239 __u8 retries;
240 __u8 sar;
241 __u8 force_active; 238 __u8 force_active;
242 struct l2cap_ctrl control; 239 struct l2cap_ctrl control;
243}; 240};