diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:25 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-11 18:44:25 +0100 |
| commit | 78f42aee884dedfd157f79d01f069550edbc95cf (patch) | |
| tree | 1f0b6a91c06cae83a647a076377d3279f7a9fb78 /include/net/bluetooth/l2cap.h | |
| parent | aa5a1b8e68c95151fd249a3b5ec444c6b0aa2f1c (diff) | |
| parent | 8708aac79e4572ba673d7a21e94ddca9f3abb7fc (diff) | |
Merge remote-tracking branch 'wireless-next/master' into HEAD
Diffstat (limited to 'include/net/bluetooth/l2cap.h')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 7588ef44eba..cdd33021f83 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -496,7 +496,6 @@ struct l2cap_chan { __u16 frames_sent; __u16 unacked_frames; __u8 retry_count; - __u16 srej_queue_next; __u16 sdu_len; struct sk_buff *sdu; struct sk_buff *sdu_last_frag; |