Re: linux-next: manual merge of the net-next tree with the wireless-drivers tree

2016-05-09 Thread Kalle Valo
Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > between commit: > > 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len") > > from the wireless-drivers tree and commit: > > d8

RE: bnx2x in 4.6rc7 with FW 7.13.1.0 not present

2016-05-09 Thread Yuval Mintz
> Upgrading a system from kernel 4.2 to 4.6rc7, there is an extra 2 minute delay > while booting due to these problems: > > [ 47.977221] bnx2x :04:00.1: Direct firmware load for > bnx2x/bnx2x-e2- > 7.13.1.0.fw failed with error -2 ... > Could the driver fall back to an older firmware v

[PATCH V3 2/4] net-next: mediatek: fix gigabit and flow control advertisement

2016-05-09 Thread John Crispin
The current code will not setup the PHYs advertisement features correctly. Fix this and properly advertise Gigabit features and properly handle asymmetric pause frames. Signed-off-by: John Crispin --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 ++-- 1 file changed, 14 inserti

Re: [PATCH net-next] fq_codel: add memory limitation per queue

2016-05-09 Thread Eric Dumazet
On Mon, 2016-05-09 at 21:57 -0700, Cong Wang wrote: > Sure, but we are talking about memory constraint case, aren't we? > > If the whole system are suffering from memory pressure, the whole > qdisc should be halted? Please read the patch again. I added a mem control, exactly to control memory u

[PATCH V3 4/4] net-next: mediatek: properly handle RGMII modes

2016-05-09 Thread John Crispin
If an external Gigabit PHY is connected to either of the MACs we need to be able to tell the PHY to use a delay. Not doing so will result in heavy packet loss and/or data corruption when using PHYs such as the IC+ IP1001. We tell the PHY which MII delay mode to use via the devictree. The ethernet

[PATCH V3 0/4] net-next: mediatek: improve phy support

2016-05-09 Thread John Crispin
The current driver did not handle the RGMII delay modes and asymmetric flow control properly. The mii_bus is not freed properly. Also add support for fixed-phy allowing the driver to work on SoCs that have an internal gigabit switch. John Crispin (4): net-next: mediatek: use mdiobus_free() in fa

[PATCH V3 3/4] net-next: mediatek: add fixed-phy support

2016-05-09 Thread John Crispin
The MT7623 SoC has a builtin gigabit switch. If we want to use it, GMAC1 needs to be configured using a fixed link speed and flow control settings. The easiest way to do this is to used the fixed-phy driver, allowing us to reuse the existing mdio polling code to setup the MAC. Reviewed-by: Andrew

[PATCH V3 1/4] net-next: mediatek: use mdiobus_free() in favour of kfree()

2016-05-09 Thread John Crispin
The driver currently uses kfree() to clear the mii_bus. This is not the correct way to clear the memory and mdiobus_free() should be used instead. This patch fixes the two instances where this happens in the driver. Reviewed-by: Andrew Lunn Signed-off-by: John Crispin --- drivers/net/ethernet/m

Re: [net PATCH v2 1/1] export tc ife uapi header

2016-05-09 Thread David Miller
From: Jamal Hadi Salim Date: Mon, 9 May 2016 08:05:06 -0400 > From: Jamal Hadi Salim > > Signed-off-by: Jamal Hadi Salim Applied, thanks.

Re: [PATCH] netfilter: conntrack: remove uninitialized shadow variable

2016-05-09 Thread David Miller
From: Arnd Bergmann Date: Mon, 9 May 2016 21:47:23 +0200 > A recent commit introduced an unconditional use of an uninitialized > variable, as reported in this gcc warning: > > net/netfilter/nf_conntrack_core.c: In function '__nf_conntrack_confirm': > net/netfilter/nf_conntrack_core.c:632:33: er

Re: pull-request: wireless-drivers 2016-05-09

2016-05-09 Thread David Miller
From: Kalle Valo Date: Mon, 09 May 2016 22:06:42 +0300 > one more iwlwifi fix we would like to get to 4.6 if possible. Please let > me know if there are any problems. Pulled, thanks Kalle.

Re: [PATCH net-next] fq_codel: add memory limitation per queue

2016-05-09 Thread Cong Wang
On Mon, May 9, 2016 at 9:45 PM, Eric Dumazet wrote: > On Mon, 2016-05-09 at 21:34 -0700, Cong Wang wrote: >> On Mon, May 9, 2016 at 7:26 AM, Eric Dumazet wrote: >> > On Sun, 2016-05-08 at 22:07 -0700, Cong Wang wrote: >> >> On Sun, May 8, 2016 at 9:31 PM, Eric Dumazet >> >> wrote: >> >> > On Su

Re: [PATCH 0/3] Netfilter fixes for net

2016-05-09 Thread David Miller
From: Pablo Neira Ayuso Date: Mon, 9 May 2016 21:52:00 +0200 > The following patchset contain Netfilter simple fixes for your net tree, > two one-liner and one two-liner: > > 1) Oneliner to fix missing spinlock definition that triggers >'BUG: spinlock bad magic on CPU#' when spinlock debugg

Re: [PATCH net-next] fq_codel: add memory limitation per queue

2016-05-09 Thread Eric Dumazet
On Mon, 2016-05-09 at 21:34 -0700, Cong Wang wrote: > On Mon, May 9, 2016 at 7:26 AM, Eric Dumazet wrote: > > On Sun, 2016-05-08 at 22:07 -0700, Cong Wang wrote: > >> On Sun, May 8, 2016 at 9:31 PM, Eric Dumazet > >> wrote: > >> > On Sun, 2016-05-08 at 21:14 -0700, Cong Wang wrote: > >> > > >> >

Re: [PATCH net-next 0/5] ip6: Transmit tunneling fixes

2016-05-09 Thread David Miller
From: Alexander Duyck Date: Mon, 9 May 2016 20:30:46 -0700 > On Mon, May 9, 2016 at 5:12 PM, Tom Herbert wrote: >> Several fixes suggested by Alexander. >> >> Tested: Running netperf TCP_STREAM with gretap and keyid configured. >> Visually verified that MTU is correctly being set. Did not test H

Re: [net-next PATCH v2 3/6] net sched: mirred action fix late binding

2016-05-09 Thread Cong Wang
On Mon, May 9, 2016 at 4:51 AM, Jamal Hadi Salim wrote: > On 16-05-08 11:19 PM, Cong Wang wrote: >> >> On Sun, May 8, 2016 at 10:26 AM, Jamal Hadi Salim >> wrote: >>> >>> -static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int >>> bind, int ref) >>> +static int tcf_mirred_dump(s

Re: [PATCH net-next] fq_codel: add memory limitation per queue

2016-05-09 Thread Cong Wang
On Mon, May 9, 2016 at 7:26 AM, Eric Dumazet wrote: > On Sun, 2016-05-08 at 22:07 -0700, Cong Wang wrote: >> On Sun, May 8, 2016 at 9:31 PM, Eric Dumazet wrote: >> > On Sun, 2016-05-08 at 21:14 -0700, Cong Wang wrote: >> > >> >> So when the packet is dropped due to memory over limit, should >> >>

[PATCH net] tcp: refresh skb timestamp at retransmit time

2016-05-09 Thread Eric Dumazet
From: Eric Dumazet In the very unlikely case __tcp_retransmit_skb() can not use the cloning done in tcp_transmit_skb(), we need to refresh skb_mstamp before doing the copy and transmit, otherwise TCP TS val will be an exact copy of original transmit. Fixes: 7faee5c0d514 ("tcp: remove TCP_SKB_CB(

Re: [PATCH net-next 0/5] ip6: Transmit tunneling fixes

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 5:12 PM, Tom Herbert wrote: > Several fixes suggested by Alexander. > > Tested: Running netperf TCP_STREAM with gretap and keyid configured. > Visually verified that MTU is correctly being set. Did not test HW > offload (Alexander plese try) This appears to have fixed the i

[RESEND PATCH v7 04/21] IB/hns: Add RoCE engine reset function

2016-05-09 Thread Lijun Ou
This patch mainly added reset flow of RoCE engine in RoCE driver. It is necessary when RoCE is loaded and removed. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_device.h | 7 drivers/infiniband/hw/hns/hns_roce_hw_v1.c |

[RESEND PATCH v7 20/21] IB/hns: Kconfig and Makefile for RoCE module

2016-05-09 Thread Lijun Ou
This patch added Kconfig and Makefile for building RoCE module. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/Kconfig | 1 + drivers/infiniband/hw/Makefile | 1 + drivers/infiniband/hw/hns/Kconfig | 10 ++ drivers/infin

[RESEND PATCH v7 09/21] IB/hns: Add hca support

2016-05-09 Thread Lijun Ou
This patch mainly setup hca for RoCE. It will do a series of initial works, as follows: 1. init uar table, allocate uar resource 2. init pd table 3. init cq table 4. init mr table 5. init qp table Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou ---

[RESEND PATCH v7 13/21] IB/hns: Add interface of the protocol stack registration

2016-05-09 Thread Lijun Ou
This patch mainly added the function module which netif notify registered the protocol stack. It includes interface functions as follows: 1. The executive called interface of RoCE when the netlink event that registered protocol stack was generated 2. The executive called interface of

[RESEND PATCH v7 18/21] IB/hns: Add CQ operations support

2016-05-09 Thread Lijun Ou
This patch was implementing for Completion Queue(CQ) operations. A CQ can be used to multiplex work completions from multiple work queues across queue pairs on the same HCA. CQ as the notification mechanism for Work Request completions. CQ operations as follows: 1. create CQ. CQ are created thr

[RESEND PATCH v7 03/21] IB/hns: Add initial main frame driver and get cfg info

2016-05-09 Thread Lijun Ou
This patch mainly added the initial bare main driver. It could get the relative configure information of net node. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_device.h | 49 drivers/infiniband/hw/hns/hns_roce_main.

[RESEND PATCH v7 06/21] IB/hns: Add initial cmd operation

2016-05-09 Thread Lijun Ou
This patch added the operation for cmd, and added some functions for initializing eq table and selecting cmd mode. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_cmd.c| 96 + drivers/infiniband/h

[RESEND PATCH v7 16/21] IB/hns: Add ah operations support

2016-05-09 Thread Lijun Ou
This patch was for implementing of address handle operations. It includes three verbs that create ah, query ah and destroy ah. They is completed independently by RoCE driver. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_ah.c

[RESEND PATCH v7 00/21] Add HiSilicon RoCE driver

2016-05-09 Thread Lijun Ou
The HiSilicon Network Substem is a long term evolution IP which is supposed to be used in HiSilicon ICT SoCs. HNS (HiSilicon Network Sybsystem) also has a hardware support of performing RDMA with RoCEE. The driver for HiSilicon RoCEE(RoCE Engine) is a platform driver and will support mulitple versi

[RESEND PATCH v7 19/21] IB/hns: Add memory region operations support

2016-05-09 Thread Lijun Ou
This patch was mainly for implementing of memory region. Memory Registration provides mechanisms that allow consumers to describe a set of virtually contiguous memory locations or a set of physically contiguous memory locations. MR operations includes as follows: 1. get dma MR in kernel mode

[RESEND PATCH v7 07/21] IB/hns: Add event queue support

2016-05-09 Thread Lijun Ou
This patch added event queue support for RoCE driver. It is used for RoCE interrupt. RoCE includes 32 synchronous event irqs, 1 asynchronous event irq and 1 common overflow irq. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_cm

[RESEND PATCH v7 12/21] IB/hns: Set mtu and gid support

2016-05-09 Thread Lijun Ou
This patch mainly set mtu and gid resource. These resource will be used to set up network transmission in nodes. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_common.h | 16 drivers/infiniband/hw/hns/hns_roce_device.h |

[RESEND PATCH v7 14/21] IB/hns: Add operations support for IB device and port

2016-05-09 Thread Lijun Ou
This patch mainly registered some relative verbs for the kernel. These operation functions will be called by user. For example: 1. modify device 2. query device 3. query_port 4. modify_port and so on. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou ---

[RESEND PATCH v7 02/21] devicetree: bindings: IB: Add binding document for HiSilicon RoCE

2016-05-09 Thread Lijun Ou
This patch added DTS binding document for HiSilicon RoCE driver. Signed-off-by: Wei Hu Signed-off-by: Lijun Ou --- .../bindings/infiniband/hisilicon-hns-roce.txt | 107 + 1 file changed, 107 insertions(+) create mode 100644 Documentation/devicetree/bindings/infiniband/

[RESEND PATCH v7 10/21] IB/hns: Add process flow to init RoCE engine

2016-05-09 Thread Lijun Ou
This patch mainly initialized the RoCE engine. It is absolutely necessary to run RoCE. It mainly includes that configure DMAE user, initialize doorbell and raq operations, enable port. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_

[RESEND PATCH v7 15/21] IB/hns: Add PD operations support

2016-05-09 Thread Lijun Ou
This patch added the verbs to operate PD. It mainly includes the functions of allocating PD and deallocating PD. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_device.h | 17 drivers/infiniband/hw/hns/hns_roce_main.c

[RESEND PATCH v7 05/21] IB/hns: Add initial profile resource

2016-05-09 Thread Lijun Ou
This patch mainly configured some profile resoure. For example, vendor_id, hardware version, and some data structure sizes so on. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_common.h | 24 + drivers/infiniband/hw/hns

[RESEND PATCH v7 08/21] IB/hns: Add icm support

2016-05-09 Thread Lijun Ou
This patch mainly added icm support for RoCE. It initializes icm which managers the relative memory blocks for RoCE. The data structures of RoCE will be located in it. For example, CQ table, QP table and MTPT table so on. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou

[RESEND PATCH v7 17/21] IB/hns: Add QP operations support

2016-05-09 Thread Lijun Ou
This patch was implementing for queue pair operations. QP Consists of a Send Work Queue and a Receive Work Queue. Send and receive queues are always created as a pair and remain that way throughout their lifetime. A Queue Pair is identified by its Queue Pair Number. QP operations as follows: 1.

[RESEND PATCH v7 11/21] IB/hns: Add IB device registration

2016-05-09 Thread Lijun Ou
This patch registered IB device when loaded, and unregistered IB device when removed. Signed-off-by: Wei Hu Signed-off-by: Nenglong Zhao Signed-off-by: Lijun Ou --- drivers/infiniband/hw/hns/hns_roce_main.c | 48 +++ 1 file changed, 48 insertions(+) diff --git a/dr

[RESEND PATCH v7 01/21] net: hns: Add reset function support for RoCE driver

2016-05-09 Thread Lijun Ou
It added reset function for RoCE driver. RoCE is a feature of hns. In hip06 SoC, in RoCE reset process, it's needed to configure dsaf channel reset, port and sl map info. Reset function of RoCE is located in dsaf module, we only call it in RoCE driver when needed. Signed-off-by: Wei Hu Signed-off

[RESEND PATCH v7 21/21] MAINTAINERS: Add maintainers for HiSilicon RoCE driver

2016-05-09 Thread Lijun Ou
This patch added maintainers for RoCE driver. Signed-off-by: Wei Hu Signed-off-by: Lijun Ou --- MAINTAINERS | 8 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index ecbb2f6..51658a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10012,6 +10012,14 @@ W: htt

Re: [PATCH] fix a kernel infoleak in x25 module

2016-05-09 Thread David Miller
From: Kangjie Lu Date: Sun, 8 May 2016 12:10:14 -0400 > Stack object "dte_facilities" is allocated in x25_rx_call_request(), > which is supposed to be initialized in x25_negotiate_facilities. > However, 5 fields (8 bytes in total) are not initialized. This > object is then copied to userland via

Re: [PATCH net-next] stmmac: dwmac-socfpga: make socfpga_dwmac_pm_ops static

2016-05-09 Thread David Miller
From: Joachim Eastwood Date: Sun, 8 May 2016 13:47:23 +0200 > Fix the following sparse warning: > drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c:274:1: warning: > symbol 'socfpga_dwmac_pm_ops' was not declared. Should it be static? > > Signed-off-by: Joachim Eastwood Applied.

Re: [PATCH net-next v3 1/2] net: l3mdev: Add hook in ip and ipv6

2016-05-09 Thread David Miller
From: David Ahern Date: Sat, 7 May 2016 21:16:44 -0700 > +static inline > +struct sk_buff *l3mdev_l3_rcv(struct sk_buff *skb, u16 proto) > +{ > + struct net_device *master = NULL; > + > + if (netif_is_l3_slave(skb->dev)) > + master = netdev_master_upper_dev_get_rcu(skb->dev);

Re: [PATCH net-next v2 0/2] net: l3mdev: Allow send on enslaved interface

2016-05-09 Thread David Miller
From: David Ahern Date: Sat, 7 May 2016 16:48:58 -0700 > First patch preps for the second. The second is required for several use > cases such as ping on an interface and BFD that need to send packets on > a specific interface, including ones enslaved to a VRF device. > > v2 > - fixed brackets

Re: [PATCH net-next] fjes: Fix unnecessary spinlock_irqsave

2016-05-09 Thread David Miller
From: Taku Izumi Date: Tue, 10 May 2016 10:28:49 +0900 > commit-bd5a256 introduces a deadlock bug in fjes_change_mtu(). > This spin_lock_irqsave() is obviously unnecessary. > > This patch eliminates unnecessary spin_lock_irqsave() in > fjes_change_mtu() > > Signed-off-by: Taku Izumi Applied,

Re: linux-next: build failure after merge of the net-next tree

2016-05-09 Thread Andy Gross
On 9 May 2016 at 20:29, Stephen Rothwell wrote: > Hi all, > > After merging the net-next tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type > [-Werror=incompatible-pointer-types] > .callback =

[PATCH net-next] fjes: Fix unnecessary spinlock_irqsave

2016-05-09 Thread Taku Izumi
commit-bd5a256 introduces a deadlock bug in fjes_change_mtu(). This spin_lock_irqsave() is obviously unnecessary. This patch eliminates unnecessary spin_lock_irqsave() in fjes_change_mtu() Signed-off-by: Taku Izumi --- drivers/net/fjes/fjes_main.c | 1 - 1 file changed, 1 deletion(-) diff --gi

Re: linux-next: build failure after merge of the net-next tree

2016-05-09 Thread David Miller
t;Merge > git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") > > But I am not reaaly sure what has happened here :-( > > I tried to use the net-next tree from next-20160509 but that now has > conflicts agains other changes, so I applied the following fix patch >

RE: [PATCH] igb: adjust ptp timestamps for tx/rx latency

2016-05-09 Thread Brown, Aaron F
> From: netdev-ow...@vger.kernel.org [mailto:netdev- > ow...@vger.kernel.org] On Behalf Of Nathan Sullivan > Sent: Tuesday, May 3, 2016 4:11 PM > To: Kirsher, Jeffrey T ; Brandeburg, Jesse > ; Nelson, Shannon > ; Wyborny, Carolyn > ; Skidmore, Donald C > ; Allan, Bruce W ; > Ronciak, John ; William

linux-next: build failure after merge of the net-next tree

2016-05-09 Thread Stephen Rothwell
Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .callback = qcom_smd_qrtr_callback, ^ net/qrtr/smd.c:106:14:

linux-next: build failure after merge of the net-next tree

2016-05-09 Thread Stephen Rothwell
el.org/pub/scm/linux/kernel/git/davem/net") which seems to have reversed some of the merge fixes in commit cba653210056 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") But I am not reaaly sure what has happened here :-( I tried to use the net-next tree from n

[PATCH 2/3] bridge: netfilter: checkpatch data type fixes

2016-05-09 Thread tcharding
From: Tobin C Harding checkpatch produces data type 'checks'. This patch amends them by changing, for example: uint8_t -> u8 Signed-off-by: Tobin C Harding --- net/bridge/netfilter/ebt_stp.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff

[PATCH 3/3] bridge: netfilter: checkpatch null comparison fixes

2016-05-09 Thread tcharding
From: Tobin C Harding checkpatch produces comparison to null 'checks'. This patch amends them. Signed-off-by: Tobin C Harding --- net/bridge/netfilter/ebt_stp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_st

[PATCH 1/3] bridge: netfilter: checkpatch whitespace fixes

2016-05-09 Thread tcharding
From: Tobin C Harding checkpatch produces various white space 'checks'. This patch amends them. Signed-off-by: Tobin C Harding --- This is my second linux kernel patch. Unsure if I was meant to cc multiple mailing lists? thanks net/bridge/netfilter/ebt_stp.c | 24

[PATCH 0/3] bridge: netfilter: checkpatch fixes

2016-05-09 Thread tcharding
From: Tobin C Harding checkpatch produces 32 'checks'. This patch set amends them all. Patch one is white space only. Patch two changes data types e.g uint8_t -> u8. Patch three amends comparison to null. Tobin C Harding (3): bridge: netfilter: checkpatch whitespace fixes bridge: netfilter:

[PATCH] Bluetooth: Fix l2cap_sock_teardown_cb race condition with bt_accept_dequeue

2016-05-09 Thread Yichen Zhao
Fix a race condition between l2cap_sock_teardown_cb on an L2CAP socket and bt_accept_dequeue on its parent socket. When the race condition is encountered bt_accept_dequeue may call bt_accept_unlink on an already unlinked socket and result in a NULL pointer dereference. Even if bt_accept_unlink is

Re: [PATCH net-next V3 00/10] cls_flower hardware offload support

2016-05-09 Thread David Miller
From: Or Gerlitz Date: Mon, 9 May 2016 23:31:52 +0300 > Wanted to check with you if such a submission can take place in > parallel with another net-next mlx5 only submission which is planned > by the driver team. One series at a time please.

linux-next: manual merge of the net-next tree with the arm-soc tree

2016-05-09 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/soc/qcom/smd.h between commit: b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference") from the arm-soc tree and commit: 43315f31adc2 ("soc: qcom: smd: Introduce compile stubs") from th

RE: [ovs-dev] [PATCH v9 net-next 4/7] openvswitch: add layer 3 flow/port support

2016-05-09 Thread Yang, Yi Y
I think it is still necessary to keep eth_type in push_eth action, for the classifier case, it will push_nsh then push_eth for the original frame, this will need to set eth_type to 0x894f by push_eth, otherwise push_eth won't know this eth_type. -Original Message- From: dev [mailto:dev-

[PATCH net-next 3/5] ip6_gre: Set inner protocol correctly in __gre6_xmit

2016-05-09 Thread Tom Herbert
Need to use adjusted protocol value for setting inner protocol. Signed-off-by: Tom Herbert --- net/ipv6/ip6_gre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 509fb92..ec209f4 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_

[PATCH net-next 0/5] ip6: Transmit tunneling fixes

2016-05-09 Thread Tom Herbert
Several fixes suggested by Alexander. Tested: Running netperf TCP_STREAM with gretap and keyid configured. Visually verified that MTU is correctly being set. Did not test HW offload (Alexander plese try) Tom Herbert (5): ip6_gre: Fix MTU setting gre6: Fix flag translations ip6_gre: Set inn

[PATCH net-next 4/5] ip6: Don't set transport header in IPv6 tunneling

2016-05-09 Thread Tom Herbert
We only need to reset network header here. Signed-off-by: Tom Herbert --- net/ipv6/ip6_tunnel.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index ade55af..50af706 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1114,8 +111

[PATCH net-next 5/5] ip6_gre: Use correct flags for reading TUNNEL_SEQ

2016-05-09 Thread Tom Herbert
Fix two spots where o_flags in a tunnel are being compared to GRE_SEQ instead of TUNNEL_SEQ. Signed-off-by: Tom Herbert --- net/ipv6/ip6_gre.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index ec209f4..ee62ec4 100644 --- a/net/i

[PATCH net-next 1/5] ip6_gre: Fix MTU setting

2016-05-09 Thread Tom Herbert
In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for the configuration. For hard_header_len and mtu calculation include IPv6 header and encapsulation overhead. In ip6gre_tunnel_init_common set t->tun_len and t->hlen correctly for the configuration. Revert to setting hard_header_len i

[PATCH net-next 2/5] gre6: Fix flag translations

2016-05-09 Thread Tom Herbert
GRE for IPv6 does not properly translate for GRE flags to tunnel flags and vice versa. This patch fixes that. Signed-off-by: Tom Herbert --- net/ipv6/ip6_gre.c | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index

[PATCH 2/6] drivers: net: xgene: fix sharing of irqs

2016-05-09 Thread Iyappan Subramanian
Since hardware doesn't allow sharing of interrupts, this patch fixes the same by removing IRQF_SHARED flag. Signed-off-by: Iyappan Subramanian Tested-by: Toan Le --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/

[PATCH 1/6] drivers: net: xgene: fix IPv4 forward crash

2016-05-09 Thread Iyappan Subramanian
This patch fixes the crash observed during IPv4 forward test by setting the drop field in the dbptr. Signed-off-by: Iyappan Subramanian Tested-by: Toan Le --- drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 11 ++- drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 2 ++ 2 files chang

[PATCH 4/6] drivers: net: xgene: fix statistics counters race condition

2016-05-09 Thread Iyappan Subramanian
This patch fixes the race condition on updating the statistics counters by moving the counters to the ring structure. Signed-off-by: Iyappan Subramanian Tested-by: Toan Le --- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 17 +++ drivers/net/ethernet/apm/xgene/xgene_enet_hw.h |

[PATCH 6/6] drivers: net: xgene: fix register offset

2016-05-09 Thread Iyappan Subramanian
This patch fixes SG_RX_DV_GATE_REG_0_ADDR register offset and ring state field lengths. Signed-off-by: Iyappan Subramanian Tested-by: Toan Le --- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h| 6 +++--- drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h | 2 +- 2 files changed, 4 insertions

[PATCH 3/6] drivers: net: xgene: fix ununiform latency across queues

2016-05-09 Thread Iyappan Subramanian
This patch addresses ununiform latency across queues by adding more queues to match with, upto number of CPU cores. Also, number of interrupts are increased and the channel numbers are reordered. Signed-off-by: Iyappan Subramanian Tested-by: Toan Le --- drivers/net/ethernet/apm/xgene/xgene_ene

[PATCH 0/6] drivers: net: xgene: Bug fixes

2016-05-09 Thread Iyappan Subramanian
This patch set addresses the following bug fixes that were found during testing. 1. IPv4 forward test crash - drivers: net: xgene: fix IPv4 forward crash 2. Sharing of irqs - drivers: net: xgene: fix sharing of irqs 3. Ununiform latency across queues - drivers: net: xgene: fix

[PATCH 5/6] drivers: net: xgene: Using static MSS values

2016-05-09 Thread Iyappan Subramanian
Due to the nature of hardware design for TSO, if the MSS values that are stored in the register, changes during TSO operation, data corruption may occur. This patch fixes the issue by using one of the predefined MSS values. Signed-off-by: Iyappan Subramanian Tested-by: Toan Le --- drivers/net/

Re: [PATCH net-next] ip6_gre: Fix MTU setting

2016-05-09 Thread Tom Herbert
On Mon, May 9, 2016 at 4:10 PM, Alexander Duyck wrote: > On Mon, May 9, 2016 at 3:49 PM, Tom Herbert wrote: >> On Mon, May 9, 2016 at 3:44 PM, Alexander Duyck >> wrote: >>> On Mon, May 9, 2016 at 3:28 PM, Tom Herbert wrote: In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for

Re: [PATCH net-next] ip6_gre: Fix MTU setting

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 4:10 PM, Alexander Duyck wrote: > On Mon, May 9, 2016 at 3:49 PM, Tom Herbert wrote: >> On Mon, May 9, 2016 at 3:44 PM, Alexander Duyck >> wrote: >>> On Mon, May 9, 2016 at 3:28 PM, Tom Herbert wrote: In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for

Re: [PATCH net-next] ip6_gre: Fix MTU setting

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 3:49 PM, Tom Herbert wrote: > On Mon, May 9, 2016 at 3:44 PM, Alexander Duyck > wrote: >> On Mon, May 9, 2016 at 3:28 PM, Tom Herbert wrote: >>> In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for the >>> configuration. For hard_header_len and mtu calculatio

Re: [PATCH v3 1/3] net: phy: add phy_ethtool_{get|set}_link_ksettings

2016-05-09 Thread David Decotigny
On Mon, May 9, 2016 at 3:19 PM, Philippe Reynes wrote: > Ethtool callbacks {get|set}_link_ksettings are often the same, so > we add two generics functions phy_ethtool_{get|set}_link_ksettings > to avoid writing severals times the same function. > > Signed-off-by: Philippe Reynes > --- > drivers/

Re: [PATCH net-next] ip6_gre: Fix MTU setting

2016-05-09 Thread Tom Herbert
On Mon, May 9, 2016 at 3:44 PM, Alexander Duyck wrote: > On Mon, May 9, 2016 at 3:28 PM, Tom Herbert wrote: >> In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for the >> configuration. For hard_header_len and mtu calculation include >> IPv6 header and encapsulation overhead. >> >>

Re: [PATCH net-next] ip6_gre: Fix MTU setting

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 3:28 PM, Tom Herbert wrote: > In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for the > configuration. For hard_header_len and mtu calculation include > IPv6 header and encapsulation overhead. > > In ip6gre_tunnel_init_common set t->tun_len and t->hlen correct

Re: [PATCH v3 net-next 00/11] ipv6: Enable GUEoIPv6 and more fixes for v6 tunneling

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 2:37 PM, Tom Herbert wrote: > On Mon, May 9, 2016 at 2:35 PM, Alexander Duyck > wrote: >> On Mon, May 9, 2016 at 10:32 AM, Alexander Duyck >> wrote: >>> On Mon, May 9, 2016 at 9:56 AM, Tom Herbert wrote: On Fri, May 6, 2016 at 8:03 PM, Alexander Duyck wrote: >>

[PATCH net-next] ip6_gre: Fix MTU setting

2016-05-09 Thread Tom Herbert
In ip6gre_tnl_link_config set t->tun_len and t->hlen correctly for the configuration. For hard_header_len and mtu calculation include IPv6 header and encapsulation overhead. In ip6gre_tunnel_init_common set t->tun_len and t->hlen correctly for the configuration. Revert to setting hard_header_len i

[PATCH v3 0/3] net: phy: add phy_ethtool_{get|set}_link_ksettings

2016-05-09 Thread Philippe Reynes
Ethtool callbacks {get|set}_link_ksettings may be the same for many drivers. So we add two generics callbacks phy_ethtool_{get|set}_link_ksettings. To use those generics callbacks, the ethernet driver must use the pointer phydev contained in struct net_device, and not use a private structure to st

[PATCH v3 1/3] net: phy: add phy_ethtool_{get|set}_link_ksettings

2016-05-09 Thread Philippe Reynes
Ethtool callbacks {get|set}_link_ksettings are often the same, so we add two generics functions phy_ethtool_{get|set}_link_ksettings to avoid writing severals times the same function. Signed-off-by: Philippe Reynes --- drivers/net/phy/phy.c | 24 include/linux/phy.h

[PATCH v3 2/3] net: ethernet: fec: use phydev from struct net_device

2016-05-09 Thread Philippe Reynes
The private structure contain a pointer to phydev, but the structure net_device already contain such pointer. So we can remove the pointer phydev in the private structure, and update the driver to use the one contained in struct net_device. Signed-off-by: Philippe Reynes --- drivers/net/ethernet

[PATCH v3 3/3] net: ethernet: fec: use phy_ethtool_{get|set}_link_ksettings

2016-05-09 Thread Philippe Reynes
There are two generics functions phy_ethtool_{get|set}_link_ksettings, so we can use them instead of defining the same code in the driver. Signed-off-by: Philippe Reynes --- drivers/net/ethernet/freescale/fec_main.c | 26 ++ 1 files changed, 2 insertions(+), 24 deletion

Re: [PATCH v2] uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h

2016-05-09 Thread Mikko Rapeli
On Mon, May 09, 2016 at 11:35:35PM +0200, Pablo Neira Ayuso wrote: > It seems linux-netdev was not Cc'ed. I cannot find this in David's > patchwork [1]. > > @Mikko: Could you resubmit including netdev@vger.kernel.org? Thanks. Done: http://patchwork.ozlabs.org/patch/620262/ -Mikko

[PATCH v2] uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h

2016-05-09 Thread Mikko Rapeli
glibc's net/if.h contains copies of definitions from linux/if.h and these conflict and cause build failures if both files are included by application source code. Changes in uapi headers, which fixed header file dependencies to include linux/if.h when it was needed, e.g. commit 1ffad83d, made the n

[PATCH v2 net-next] tcp: replace cnt & rtt with struct in pkts_acked()

2016-05-09 Thread Lawrence Brakmo
Replace 2 arguments (cnt and rtt) in the congestion control modules' pkts_acked() function with a struct. This will allow adding more information without having to modify existing congestion control modules (tcp_nv in particular needs bytes in flight when packet was sent). As proposed by Neal Card

Re: [PATCH v3 net-next 00/11] ipv6: Enable GUEoIPv6 and more fixes for v6 tunneling

2016-05-09 Thread Tom Herbert
On Mon, May 9, 2016 at 2:35 PM, Alexander Duyck wrote: > On Mon, May 9, 2016 at 10:32 AM, Alexander Duyck > wrote: >> On Mon, May 9, 2016 at 9:56 AM, Tom Herbert wrote: >>> On Fri, May 6, 2016 at 8:03 PM, Alexander Duyck >>> wrote: On Fri, May 6, 2016 at 7:11 PM, Tom Herbert wrote: >

Re: [PATCH v3 net-next 00/11] ipv6: Enable GUEoIPv6 and more fixes for v6 tunneling

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 10:32 AM, Alexander Duyck wrote: > On Mon, May 9, 2016 at 9:56 AM, Tom Herbert wrote: >> On Fri, May 6, 2016 at 8:03 PM, Alexander Duyck >> wrote: >>> On Fri, May 6, 2016 at 7:11 PM, Tom Herbert wrote: On Fri, May 6, 2016 at 7:03 PM, Alexander Duyck wrote:

[iproute PATCH] ss: Remove unused argument from kill_inet_sock

2016-05-09 Thread Subash Abhinov Kasiviswanathan
addr is not used here. Signed-off-by: Subash Abhinov Kasiviswanathan --- misc/ss.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index deefc96..5cda728 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -2232,8 +2232,7 @@ struct inet_diag_arg { str

Re: [net-next PATCH V1 1/3] net: bulk alloc and reuse of SKBs in NAPI context

2016-05-09 Thread Alexander Duyck
On Mon, May 9, 2016 at 12:59 PM, Jesper Dangaard Brouer wrote: > On Mon, 9 May 2016 09:20:41 -0700 > Alexander Duyck wrote: > >> On Mon, May 9, 2016 at 6:44 AM, Jesper Dangaard Brouer >> wrote: >> > This patch introduce bulk alloc of SKBs and allow reuse of SKBs >> > free'ed in same softirq cycl

Re: [PATCH net-next V3 00/10] cls_flower hardware offload support

2016-05-09 Thread Or Gerlitz
On Fri, Mar 11, 2016 at 12:24 AM, David Miller wrote: > From: Amir Vadai > Date: Tue, 8 Mar 2016 12:42:28 +0200 >> This patchset introduces cls_flower hardware offload support over ConnectX-4 >> driver, more hardware vendors are welcome to use it too. > Series applied, thanks for retaining det

bnx2x in 4.6rc7 with FW 7.13.1.0 not present

2016-05-09 Thread Elliott, Robert (Persistent Memory)
Upgrading a system from kernel 4.2 to 4.6rc7, there is an extra 2 minute delay while booting due to these problems: [ 47.977221] bnx2x :04:00.1: Direct firmware load for bnx2x/bnx2x-e2-7.13.1.0.fw failed with error -2 [ 48.029997] bnx2x :04:00.1: Falling back to user helper

Re: [PATCH] netfilter: conntrack: remove uninitialized shadow variable

2016-05-09 Thread Arnd Bergmann
On Monday 09 May 2016 22:01:17 Pablo Neira Ayuso wrote: > On Mon, May 09, 2016 at 09:47:23PM +0200, Arnd Bergmann wrote: > > A recent commit introduced an unconditional use of an uninitialized > > variable, as reported in this gcc warning: > > > > net/netfilter/nf_conntrack_core.c: In function '__

Re: [net-next PATCH V1 2/3] mlx4: use napi_alloc_skb API to get SKB bulk allocations

2016-05-09 Thread Jesper Dangaard Brouer
On Mon, 9 May 2016 09:47:08 -0700 Alexander Duyck wrote: > On Mon, May 9, 2016 at 6:44 AM, Jesper Dangaard Brouer > wrote: > > Activate the bulk alloc API, simply by changing mlx4 from using > > netdev_alloc_skb() to using napi_alloc_skb(). > > This patch is just enabling the napi_alloc_skb c

Re: [net-next PATCH V1 3/3] net: warn on napi_alloc_skb being called in wrong context

2016-05-09 Thread Jesper Dangaard Brouer
On Mon, 9 May 2016 09:33:25 -0700 Alexander Duyck wrote: > On Mon, May 9, 2016 at 6:44 AM, Jesper Dangaard Brouer > wrote: > > It have always been required to call napi_alloc_skb from NAPI/softirq > > context, which implies running with local_bh_disable'ed. Thus, this > > code path should alrea

Re: [PATCH] netfilter: conntrack: remove uninitialized shadow variable

2016-05-09 Thread Pablo Neira Ayuso
On Mon, May 09, 2016 at 09:47:23PM +0200, Arnd Bergmann wrote: > A recent commit introduced an unconditional use of an uninitialized > variable, as reported in this gcc warning: > > net/netfilter/nf_conntrack_core.c: In function '__nf_conntrack_confirm': > net/netfilter/nf_conntrack_core.c:632:33:

Re: [net-next PATCH V1 1/3] net: bulk alloc and reuse of SKBs in NAPI context

2016-05-09 Thread Jesper Dangaard Brouer
On Mon, 9 May 2016 09:20:41 -0700 Alexander Duyck wrote: > On Mon, May 9, 2016 at 6:44 AM, Jesper Dangaard Brouer > wrote: > > This patch introduce bulk alloc of SKBs and allow reuse of SKBs > > free'ed in same softirq cycle. SKBs are normally free'ed during TX > > completion, but most high spe

[PATCH 1/3] netfilter: conntrack: init all_locks to avoid debug warning

2016-05-09 Thread Pablo Neira Ayuso
From: Florian Westphal Else we get 'BUG: spinlock bad magic on CPU#' on resize when spin lock debugging is enabled. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nf_conntrack_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ne

  1   2   3   >