linux-stable.git/net/6lowpan, branch linux-4.0.y

net/6lowpan: Remove FSF address from GPL statement.

2014-12-05T11:43:04+00:00

This might change and we already deliver a copy of the license with
the kernel. This was already removed form the ieee802154 code but
missed here.

Signed-off-by: Stefan Schmidt 
Acked-by: Alexander Aring 
Acked-by: Jukka Rissanen 
Signed-off-by: Marcel Holtmann

6lowpan: move skb_free from error paths in decompression

2014-11-06T21:09:48+00:00

Currently we ensure that the skb is freed on every error path in IPHC
decompression which makes it easy to introduce skb leaks.  By centralising
the skb_free into the receive function it makes future decompression routines
easier to maintain.  It does come at the expense of ensuring that the skb
passed into the decompression routine must not be copied.

Signed-off-by: Martin Townsend 
Acked-by: Jukka Rissanen 
Acked-by: Alexander Aring 
Signed-off-by: Marcel Holtmann

6lowpan: fix udp header compression when using raw sockets

2014-11-04T16:31:01+00:00

If you use RAW sockets the transport header offset is not set by the
ipv6 stack so when we get to the udp header compression it does not
compress the right part of the packet.

This patch adds a check for this scenario and sets the transport
header offset.

Signed-off-by: Simon Vincent 
Acked-by: Alexander Aring 
Signed-off-by: Marcel Holtmann

ieee802154: 6lowpan: rename process_data and lowpan_process_data

2014-10-27T14:51:16+00:00

As we have decouple decompression from data delivery we can now rename all
occurences of process_data in receive path.

Signed-off-by: Martin Townsend 
Acked-by: Alexander Aring 
Acked-by: Jukka Rissanen 
Signed-off-by: Marcel Holtmann

6lowpan: remove skb_deliver from IPHC

2014-10-27T14:51:15+00:00

Separating skb delivery from decompression ensures that we can support further
decompression schemes and removes the mixed return value of error codes with
NET_RX_FOO.

Signed-off-by: Martin Townsend 
Acked-by: Alexander Aring 
Acked-by: Jukka Rissanen 
Signed-off-by: Marcel Holtmann

6lowpan: Use skb_cow in IPHC decompression.

2014-10-25T05:56:25+00:00

Currently there are potentially 2 skb_copy_expand calls in IPHC
decompression.  This patch replaces this with one call to
skb_cow which will check to see if there is enough headroom
first to ensure it's only done if necessary and will handle
alignment issues for cache.
As skb_cow uses pskb_expand_head we ensure the skb isn't shared from
bluetooth and ieee802.15.4 code that use the IPHC decompression.

Signed-off-by: Martin Townsend 
Acked-by: Alexander Aring 
Acked-by: Jukka Rissanen 
Signed-off-by: Marcel Holtmann

6lowpan: Allow 6LoWPAN to be modular

2014-08-07T18:44:18+00:00

Change config symbol 6LOWPAN from type bool to type tristate, so
6LoWPAN can be built modular, just like IPV6

Signed-off-by: Geert Uytterhoeven 
Acked-by: Marcel Holtmann 
Signed-off-by: David S. Miller

Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2014-08-05T20:18:20+00:00

Conflicts:
	net/6lowpan/iphc.c

Minor conflicts in iphc.c were changes overlapping with some
style cleanups.

John W. Linville says:

====================
Please pull this last(?) batch of wireless change intended for the
3.17 stream...

For the NFC bits, Samuel says:

"This is a rather quiet one, we have:

- A new driver from ST Microelectronics for their NCI ST21NFCB,
  including device tree  support.

- p2p support for the ST21NFCA driver

- A few fixes an enhancements for the NFC digital laye"

For the Atheros bits, Kalle says:

"Michal and Janusz did some important RX aggregation fixes, basically we
were missing RX reordering altogether. The 10.1 firmware doesn't support
Ad-Hoc mode and Michal fixed ath10k so that it doesn't advertise Ad-Hoc
support with that firmware. Also he implemented a workaround for a KVM
issue."

For the Bluetooth bits, Gustavo and Johan say:

"To quote Gustavo from his previous request:

'Some last minute fixes for -next. We have a fix for a use after free in
RFCOMM, another fix to an issue with ADV_DIRECT_IND and one for ADV_IND with
auto-connection handling.  Last, we added support for reading the codec and
MWS setting for controllers that support these features.'

Additionally there are fixes to LE scanning, an update to conform to the 4.1
core specification as well as fixes for tracking the page scan state. All
of these fixes are important for 3.17."

And,

"We've got:

- 6lowpan fixes/cleanups
- A couple crash fixes, one for the Marvell HCI driver and another in LE SMP.
- Fix for an incorrect connected state check
- Fix for the bondable requirement during pairing (an issue which had
  crept in because of using "pairable" when in fact the actual meaning
  was "bondable" (these have different meanings in Bluetooth)"

Along with those are some late-breaking hardware support patches in
brcmfmac and b43 as well as a stray ath9k patch.
====================

Signed-off-by: David S. Miller

6lowpan: iphc: Fix parenthesis alignments which off-by-one

2014-07-30T17:28:40+00:00

CHECK: Alignment should match open parenthesis
+	if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
+	     (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {

CHECK: Alignment should match open parenthesis
+		if ((hdr->priority == 0) &&
+		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {

CHECK: Alignment should match open parenthesis
+		if ((hdr->priority == 0) &&
+		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {

Signed-off-by: Marcel Holtmann 
Signed-off-by: Johan Hedberg

6lowpan: iphc: Fix missing braces for if statement

2014-07-30T17:28:40+00:00

CHECK: braces {} should be used on all arms of this statement
+	if ((iphc0 & 0x03) != LOWPAN_IPHC_TTL_I)
[...]
+	else {
[...]

Signed-off-by: Marcel Holtmann 
Signed-off-by: Johan Hedberg