Commits · 4d5c152e8694b57094e320060be4621dee5779dd · Kirill Smelkov / linux

21 Jan, 2013 29 commits

ndisc: Use compound literals to build redirect message. · 4d5c152e
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
4d5c152e

ndisc: Break down ndisc_build_skb() and build message directly. · 1cb3fe51

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Construct NS/NA/RS message directly using C99 compound literals.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1cb3fe51

ndisc: Break down __ndisc_send(). · b44b5f4a

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

b44b5f4a

ndisc: Fill in ICMPv6 checksum and IPv6 header in ndisc_send_skb(). · 7b3d9b06
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
7b3d9b06

ndisc: Use ndisc_send_skb() for redirect. · f4de84c6

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Reuse dst if one is attached with skb.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

f4de84c6

ndisc: Remove icmp6h argument from ndisc_send_skb(). · aa4bdd4b

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

skb_transport_header() (thus icmp6_hdr()) is available here,
use it.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

aa4bdd4b

ndisc: Make ndisc_fill_xxx_option() for sk_buff. · 5f5a0115
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
5f5a0115
ndisc: Calculate message body length and option length separately. · 2ce13576
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
2ce13576
ndisc: Reset skb->trasport_headner inside ndisc_alloc_send_skb(). · 5135e633
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
5135e633

ndisc: Defer building IPv6 header. · 527a150f

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Build ICMPv6 message first and make buffer management easier;
we can use skb->len when filling checksum in ICMPv6 header,
and then build IP header with length field.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

527a150f

ndisc: Remove dev argument for ndisc_send_skb(). · af9a9976

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Since we have skb->dev, use it.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

af9a9976

ndisc: Set skb->dev and skb->protocol inside ndisc_alloc_skb(). · f382d03a
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
f382d03a

ndisc: Simplify arguments for ip6_nd_hdr(). · c8d6c380

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

c8d6c380

ipv6: Unshare ip6_nd_hdr() and change return type to void. · 2576f17d

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

- move ip6_nd_hdr() to its users' source files.
  In net/ipv6/mcast.c, it will be called ip6_mc_hdr().
- make return type to void since this function never fails.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

2576f17d

ndisc: Introduce ndisc_alloc_skb() helper. · de09334b

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

de09334b

ndisc: Introduce ndisc_fill_redirect_hdr_option(). · 9c86dafe
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
9c86dafe

ndisc: Use skb_linearize() instead of pskb_may_pull(skb, skb->len). · 6bce6b4e

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Suggested by Eric Dumazet <edumazet@google.com>.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

6bce6b4e

ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h. · c558e9fc

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

This also makes ndisc_opt_addr_data() and ndisc_fill_addr_option()
use ndisc_opt_addr_space().
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

c558e9fc

ndisc: Reduce number of arguments for ndisc_fill_addr_option(). · 315ff09d

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 21, 2013

Add pointer to struct net_device (dev) and remove
data_len (= dev->addr_len) and addr_type (= dev->type).
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

315ff09d

net: ethernet: davinci: Fix build breakage · 73734702

Thierry Reding authored Jan 21, 2013

The correct name of the transmit DMA channel field in struct emac_priv
is txchan, not txch.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

73734702

firewire net: Use LL_RESERVED_SPACE(), HH_DATA_OFF(). · 82586340
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 19, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
82586340

firewire net: Ensure checksumming in upper layer. · b577d7e2

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 19, 2013

It is wrong to set skb->ip_summed to CHECKSUM_UNNECESSARY unless
the device has already checked it.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

b577d7e2

usbnet: pegasus: set wakeup enable in set_wol · 4fbc5b20

Ming Lei authored Jan 19, 2013

This patch calls device_set_wakeup_enable() inside set_wol
callback, so that turning on WOL from user mode utility
can make the 'wakeup' of pegasus device to be enabled, then
remote wakeup may be enabled before putting into sleep.

Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Petko Manolov <petkan@users.sourceforge.net>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4fbc5b20

net/mlx4_en: remove redundant code · 546bfedb

Eric Dumazet authored Jan 17, 2013

remove redundant code from build_inline_wqe()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

546bfedb

ndisc: Make several arguments for ndisc_send_na() boolean. · fb568637
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 20, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
fb568637
ipv6: Optimize ipv6_addr_is_ll_all_{nodes,routers}(). · d1641565
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 20, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
d1641565

ipv6: Optimize ipv6_addr_is_solict_mult(). · 9d100774

YOSHIFUJI Hideaki / 吉藤英明 authored Jan 20, 2013

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

9d100774

ipv6: Introduce ipv6_addr_is_solict_mult() to check Solicited Node Multicast Addresses. · ca97a644
YOSHIFUJI Hideaki / 吉藤英明 authored Jan 20, 2013
```
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
```
ca97a644

ipv6: Make ipv6_addr_is_XXX() return boolean. · b27b28cb

YOSHIFUJI Hideaki authored Jan 21, 2013

ipv6_addr_is_{multicast,ll_all_nodes,ll_all_routers,isatap}()
return boolean.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

b27b28cb

19 Jan, 2013 11 commits

net: asix: ax88772_unbind() can be static · ad327910

Wu Fengguang authored Jan 18, 2013

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

ad327910

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 8f609845

David S. Miller authored Jan 19, 2013

Jeff Kirsher says:

====================
This series contains updates to ixgbe, ixgbevf and igb.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>

8f609845

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

David S. Miller authored Jan 19, 2013

Included changes:
- sysfs removal postponement during interface un-registration
- random32() function renaming
- struct refactoring
- kernel doc improvement
- deleyed_work initialisation clean up work
- copyright year and internal version number update
- kernel doc improvement
Signed-off-by: David S. Miller <davem@davemloft.net>

41d06b13

batman-adv: Start new development cycle · 5ac2a177

Antonio Quartulli authored Jan 03, 2013

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

5ac2a177

batman-adv: update copyright years · 0b873931

Antonio Quartulli authored Jan 04, 2013

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

0b873931

batman-adv: postpone sysfs removal when unregistering · 5bc44dc8

Simon Wunderlich authored Jan 11, 2013

When processing the unregister notify for a hard interface, removing
the sysfs files may lead to a circular deadlock (rtnl mutex <->
s_active).

To overcome this problem, postpone the sysfs removal in a worker.
Reported-by: Sasha Levin <sasha.levin@oracle.com>
Reported-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

5bc44dc8

batman-adv: rename random32() to prandom_u32() · e76e4320

Akinobu Mita authored Dec 24, 2012

Use more preferable function name which implies using a pseudo-random
number generator.
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Antonio Quartulli <ordex@autistici.org>
Cc: b.a.t.m.a.n@lists.open-mesh.org
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

e76e4320

batman-adv: kernel doc for types.h · 88a32c9a

Marek Lindner authored Dec 25, 2012

Thanks to Sven Eckelmann and Simon Wunderlich for their support.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

88a32c9a

batman-adv: rename batadv_claim struct to make clear it is used by bla · 712bbfe4
Marek Lindner authored Dec 25, 2012
```
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
```
712bbfe4
batman-adv: rename batadv_backbone_gw struct to make clear it is used by bla · bae98774
Marek Lindner authored Dec 25, 2012
```
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
```
bae98774
batman-adv: rename batadv_recvlist_node struct to make clear it is used by vis · 28500f07
Marek Lindner authored Dec 25, 2012
```
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
```
28500f07