lwn.git/drivers/net/hyperv, branch standardize-docs

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

2017-06-30T16:43:08+00:00

A set of overlapping changes in macvlan and the rocker driver, nothing serious. Signed-off-by: David S. Miller

hv_netvsc: Fix the carrier state error when data path is off

2017-06-22T17:30:37+00:00

When the VF NIC is opened, the synthetic NIC's carrier state is set to off. This tells the host to transitions data path to the VF device. But if startup script or user manipulates the admin state of the netvsc device directly for example: # ifconfig eth0 down # ifconfig eth0 up Then the carrier state of the synthetic NIC would be on, even though the data path was still over the VF NIC. This patch sets the carrier state of synthetic NIC with consideration of the related VF state. Signed-off-by: Haiyang Zhang Reviewed-by: Stephen Hemminger Signed-off-by: David S. Miller

hv_netvsc: Remove unnecessary var link_state from struct netvsc_device_info

2017-06-22T17:30:37+00:00

We simply use rndis_device->link_state in the netdev_dbg. The variable, link_state from struct netvsc_device_info, is not used anywhere else. Signed-off-by: Haiyang Zhang Reviewed-by: Stephen Hemminger Signed-off-by: David S. Miller

netvsc: don't access netdev->num_rx_queues directly

2017-06-22T17:27:28+00:00

This structure member is hidden behind CONFIG_SYSFS, and we get a build error when that is disabled: drivers/net/hyperv/netvsc_drv.c: In function 'netvsc_set_channels': drivers/net/hyperv/netvsc_drv.c:754:49: error: 'struct net_device' has no member named 'num_rx_queues'; did you mean 'num_tx_queues'? drivers/net/hyperv/netvsc_drv.c: In function 'netvsc_set_rxfh': drivers/net/hyperv/netvsc_drv.c:1181:25: error: 'struct net_device' has no member named 'num_rx_queues'; did you mean 'num_tx_queues'? As the value is only set once to the argument of alloc_netdev_mq(), we can compare against that constant directly. Fixes: ff4a44199012 ("netvsc: allow get/set of RSS indirection table") Fixes: 2b01888d1b45 ("netvsc: allow more flexible setting of number of channels") Signed-off-by: Arnd Bergmann Reviewed-by: Haiyang Zhang Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller

networking: introduce and use skb_put_data()

2017-06-16T15:48:37+00:00

A common pattern with skb_put() is to just want to memcpy() some data into the new space, introduce skb_put_data() for this. An spatch similar to the one for skb_put_zero() converts many of the places using it: @@ identifier p, p2; expression len, skb, data; type t, t2; @@ ( -p = skb_put(skb, len); +p = skb_put_data(skb, data, len); | -p = (t)skb_put(skb, len); +p = skb_put_data(skb, data, len); ) ( p2 = (t2)p; -memcpy(p2, data, len); | -memcpy(p, data, len); ) @@ type t, t2; identifier p, p2; expression skb, data; @@ t *p; ... ( -p = skb_put(skb, sizeof(t)); +p = skb_put_data(skb, data, sizeof(t)); | -p = (t *)skb_put(skb, sizeof(t)); +p = skb_put_data(skb, data, sizeof(t)); ) ( p2 = (t2)p; -memcpy(p2, data, sizeof(*p)); | -memcpy(p, data, sizeof(*p)); ) @@ expression skb, len, data; @@ -memcpy(skb_put(skb, len), data, len); +skb_put_data(skb, data, len); (again, manually post-processed to retain some comments) Reviewed-by: Stephen Hemminger Signed-off-by: Johannes Berg Signed-off-by: David S. Miller

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

2017-06-15T15:59:32+00:00

The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller

netvsc: fold in get_outbound_net_device

2017-06-09T16:15:05+00:00

No longer need common code to find get_outbound_net_device. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller

netvsc: pass net_device to netvsc_init_buf and netvsc_connect_vsp

2017-06-09T16:15:05+00:00

Don't need to find netvsc_device structure, caller already had it. Also rearrange declarations. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller

netvsc: mark error cases as unlikely

2017-06-09T16:15:03+00:00

Mark if() statements used for error handling only as unlikely() Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller

netvsc: use typed pointer for internal state

2017-06-09T16:15:02+00:00

The element netvsc_device:extension is always a pointer to RNDIS information. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller