diff options
author | Andy Green <andy.green@linaro.org> | 2011-12-02 14:06:18 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-12-02 14:06:18 +0800 |
commit | b95db3b5e974b74a3a8c2bf1fb2a1b4e847b6329 (patch) | |
tree | e68bbba85915d5642d498a53b444020144eac464 | |
parent | 3e4673059bd54bb1ed525705800d404ebc454532 (diff) |
enforce zero diff
Ran out of time to clean these up, they are whitespace or dead code.
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 | ||||
-rw-r--r-- | drivers/net/ppp/pppolac.c | 2 | ||||
-rw-r--r-- | drivers/net/ppp/pppopns.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/Makefile | 4 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/Makefile | 2 | ||||
-rw-r--r-- | net/bluetooth/l2cap_core.c | 92 |
6 files changed, 8 insertions, 96 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 7f02227c697..5b156da635f 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -469,7 +469,7 @@ __und_usr: blo __und_usr_unknown 3: ldrht r0, [r4] add r2, r2, #2 @ r2 is PC + 2, make it PC + 4 - str r2, [sp, #S_PC] @ it's a 2x16bit instr, update + str r2, [sp, #S_PC] @ it's a 2x16bit instr, update orr r0, r0, r5, lsl #16 #if __LINUX_ARM_ARCH__ < 7 diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c index c94b8507d92..4f3ba1dd082 100644 --- a/drivers/net/ppp/pppolac.c +++ b/drivers/net/ppp/pppolac.c @@ -1,4 +1,4 @@ -/* drivers/net/pppolac.c +/* drivers/net/ppp/pppolac.c * * Driver for PPP on L2TP Access Concentrator / PPPoLAC Socket (RFC 2661) * diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c index fb819844793..6e4a6f8d0e1 100644 --- a/drivers/net/ppp/pppopns.c +++ b/drivers/net/ppp/pppopns.c @@ -1,4 +1,4 @@ -/* drivers/net/pppopns.c +/* drivers/net/ppp/pppopns.c * * Driver for PPP on PPTP Network Server / PPPoPNS Socket (RFC 2637) * diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 7393995c102..af7ae603a2f 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -58,7 +58,9 @@ obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx/ obj-$(CONFIG_IWM) += iwmc3200wifi/ obj-$(CONFIG_MWIFIEX) += mwifiex/ + obj-$(CONFIG_BRCMFMAC) += brcm80211/ obj-$(CONFIG_BRCMUMAC) += brcm80211/ obj-$(CONFIG_BRCMSMAC) += brcm80211/ -obj-$(CONFIG_BCM4329) += brcm80211/ +obj-$(CONFIG_BCM4329) += bcm80211/ +obj-$(CONFIG_BCMDHD) += brcm80211/ diff --git a/drivers/net/wireless/brcm80211/Makefile b/drivers/net/wireless/brcm80211/Makefile index c937d55ecfb..ef5a45242f2 100644 --- a/drivers/net/wireless/brcm80211/Makefile +++ b/drivers/net/wireless/brcm80211/Makefile @@ -22,4 +22,4 @@ obj-$(CONFIG_BRCMUTIL) += brcmutil/ obj-$(CONFIG_BRCMFMAC) += brcmfmac/ obj-$(CONFIG_BRCMSMAC) += brcmsmac/ obj-$(CONFIG_BCM4329) += bcm4329/ -obj-$(CONFIG_BCMDHD) += bcmdhd/ +obj-$(CONFIG_BCMDHD) += bcmdhd/ diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index e93ad0f6b2b..d71b62b1dc2 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -3156,8 +3156,7 @@ static int l2cap_reassemble_sdu(struct l2cap_chan *chan, struct sk_buff *skb, u1 if (chan->sdu) break; - err = chan->ops->recv(chan->data, skb); - break; + return chan->ops->recv(chan->data, skb); case L2CAP_SDU_START: if (chan->sdu) @@ -3279,95 +3278,6 @@ void l2cap_chan_busy(struct l2cap_chan *chan, int busy) } } -static int l2cap_streaming_reassembly_sdu(struct l2cap_chan *chan, struct sk_buff *skb, u16 control) -{ - struct sk_buff *_skb; - int err = -EINVAL; - - /* - * TODO: We have to notify the userland if some data is lost with the - * Streaming Mode. - */ - - switch (control & L2CAP_CTRL_SAR) { - case L2CAP_SDU_UNSEGMENTED: - if (test_bit(CONN_SAR_SDU, &chan->conn_state)) { - kfree_skb(chan->sdu); - break; - } - - return chan->ops->recv(chan->data, skb); - - case L2CAP_SDU_START: - if (test_bit(CONN_SAR_SDU, &chan->conn_state)) { - kfree_skb(chan->sdu); - break; - } - - chan->sdu_len = get_unaligned_le16(skb->data); - skb_pull(skb, 2); - - if (chan->sdu_len > chan->imtu) { - err = -EMSGSIZE; - break; - } - - chan->sdu = bt_skb_alloc(chan->sdu_len, GFP_ATOMIC); - if (!chan->sdu) { - err = -ENOMEM; - break; - } - - memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len); - - set_bit(CONN_SAR_SDU, &chan->conn_state); - chan->partial_sdu_len = skb->len; - err = 0; - break; - - case L2CAP_SDU_CONTINUE: - if (!test_bit(CONN_SAR_SDU, &chan->conn_state)) - break; - - memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len); - - chan->partial_sdu_len += skb->len; - if (chan->partial_sdu_len > chan->sdu_len) - kfree_skb(chan->sdu); - else - err = 0; - - break; - - case L2CAP_SDU_END: - if (!test_bit(CONN_SAR_SDU, &chan->conn_state)) - break; - - memcpy(skb_put(chan->sdu, skb->len), skb->data, skb->len); - - clear_bit(CONN_SAR_SDU, &chan->conn_state); - chan->partial_sdu_len += skb->len; - - if (chan->partial_sdu_len > chan->imtu) - goto drop; - - if (chan->partial_sdu_len == chan->sdu_len) { - _skb = skb_clone(chan->sdu, GFP_ATOMIC); - err = chan->ops->recv(chan->data, _skb); - if (err < 0) - kfree_skb(_skb); - } - err = 0; - -drop: - kfree_skb(chan->sdu); - break; - } - - kfree_skb(skb); - return err; -} - static void l2cap_check_srej_gap(struct l2cap_chan *chan, u8 tx_seq) { struct sk_buff *skb; |