Commits · 5051c94bb3998ff24bf07ae3b72dca30f85962f8 · Kirill Smelkov / linux

25 Jun, 2012 34 commits

Documentation/networking/caif: Update documentation · 5051c94b

Sjur Brændeland authored Jun 25, 2012

Update drawing and remove description of old features.
Add HSI and USB link layers to the drawing.
Reported-by: Joerg Reisenweber <joerg.reisenweber@stericssion.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5051c94b

caif-hsi: Remove uncecessary assignments · b42f7b5c

Sjur Brændeland authored Jun 25, 2012

Remove assignment at declaration when not needed.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

b42f7b5c

caif-hsi: Use netdev_X instead of dev_X for printing · 90de9bab

Sjur Brændeland authored Jun 25, 2012

Replace dev_X with the corresponding netdev_X print
function when applicable.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

90de9bab

caif-hsi: changed test on aggregation_timeout · a5c96b51

Kim Lilliestierna XX authored Jun 25, 2012

Aggregation_timeout is an unsigned long,
a test for less than zero can never become true,
compare with zero instead.
Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

a5c96b51

caif-hsi: Removed dead code · 4e7bb59d

Kim Lilliestierna XX authored Jun 25, 2012

Simplify logic and remove dead code.
Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4e7bb59d

caif: Fixed potential memory leak · f315fd35

Kim Lilliestierna XX authored Jun 25, 2012

Rearranged the allocation and packet creations to
avoid potential leaks in error path.
Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

f315fd35

caif: added check for potential null return · c95567c8

Kim Lilliestierna XX authored Jun 25, 2012

Add check on NULL return from caif_get().
Signed-off-by: Kim Lilliestierna <Kim.xx.Lilliestierna@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericssion.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

c95567c8

caif: Remove unused pointer and code · be4852c9

Kim Lilliestierna XX authored Jun 25, 2012

Removed surplus call to caif_device_list() in caif_dev.c
Signed-off-by: Kim Lilliestierna <kim.xx.lilliestierna@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

be4852c9

6lowpan: remove excessive argument in pr_debug · e71094f9

alex.bluesman.smirnov@gmail.com authored Jun 25, 2012

Remove excessive __func__ argument in pr_debug function and some
excessive debug messages.
Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

e71094f9

6lowpan: fix hop limit compression · 5c00c0cb

alex.bluesman.smirnov@gmail.com authored Jun 25, 2012

Add missing pointer shift for the 'default' case.
Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Cc: Tony Cheneau <tony.cheneau+zigbeedev@amnesiak.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

5c00c0cb

6lowpan: read data from skb safely · c5d3687f

alex.bluesman.smirnov@gmail.com authored Jun 25, 2012

Check if skb buffer can pull requested amount of bytes and return
an error in opposite case.
Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

c5d3687f

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · 1d5873e9

David S. Miller authored Jun 25, 2012

Included changes:
- yet another batch of 'namespace cleaning' patches

Conflicts:
	net/batman-adv/translation-table.c
Signed-off-by: David S. Miller <davem@davemloft.net>

1d5873e9

be2net: Regression bug wherein VFs creation broken for multiple cards. · 7665de15

Somnath Kotur authored Jun 24, 2012

Fix be_find_vfs() to check for matching bus number as well along with devfn
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7665de15

be2net: Explicitly clear the reserved field in the Tx Descriptor · 89b1f496
Somnath Kotur authored Jun 24, 2012
```
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
89b1f496

net: struct sock cleanups · deaa5854

Eric Dumazet authored Jun 24, 2012

Add missing kernel doc for sk_rx_dst

Move sk_rx_dst to avoid two 32bit holes on 64bit arches
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

deaa5854

net: Remove 'unlikely' qualifier in skb_steal_sock() · efc27f8c

Vijay Subramanian authored Jun 24, 2012

With early demux enabled by default for TCP flows, there is high chance that
skb->sk will be non-null. 'unlikely()' was removed from __inet_lookup_skb() but
maybe it can be removed from skb_steal_sock() as well.

Note: skb_steal_sock() is also called by __inet6_lookup_skb() and
__udp4_lib_lookup_skb() but they are protected by their own 'unlikely' calls.
Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

efc27f8c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e486463e

David S. Miller authored Jun 25, 2012

Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.
Signed-off-by: David S. Miller <davem@davemloft.net>

e486463e

ipv6: fib: fix fib dump restart · fa809e2f

Eric Dumazet authored Jun 25, 2012

Commit 2bec5a36 (ipv6: fib: fix crash when changing large fib
while dumping it) introduced ability to restart the dump at tree root,
but failed to skip correctly a count of already dumped entries. Code
didn't match Patrick intent.

We must skip exactly the number of already dumped entries.

Note that like other /proc/net files or netlink producers, we could
still dump some duplicates entries.
Reported-by: Debabrata Banerjee <dbavatar@gmail.com>
Reported-by: Josh Hunt <johunt@akamai.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

fa809e2f

netxen: Error return off by one for XG port. · ed3b856b

Santosh Nayak authored Jun 20, 2012

There are  NETXEN_NIU_MAX_XG_PORTS ports.
Port indexing starts from zero.
Hence we should also return error for  'port == NETXEN_NIU_MAX_XG_PORTS'.
Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>

ed3b856b

netxen: Error return off by one in 'netxen_nic_set_pauseparam()'. · d8140b2f

Santosh Nayak authored Jun 19, 2012

There are 'NETXEN_NIU_MAX_GBE_PORTS'  GBE ports. Port indexing starts
from zero.
Hence we should also return error for "port == NETXEN_NIU_MAX_GBE_PORTS"
Signed-off-by: Santosh Nayak <santoshprasadnayak@gmail.com>

d8140b2f

batman-adv: Prefix translation-table local static functions with batadv_ · a513088d

Sven Eckelmann authored May 16, 2012

All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.
Signed-off-by: Sven Eckelmann <sven@narfation.org>