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

Pull networking changes from David Miller:
 "Noteworthy changes this time around:

   1) Multicast rejoin support for team driver, from Jiri Pirko.

   2) Centralize and simplify TCP RTT measurement handling in order to
      reduce the impact of bad RTO seeding from SYN/ACKs.  Also, when
      both timestamps and local RTT measurements are available prefer
      the later because there are broken middleware devices which
      scramble the timestamp.

      From Yuchung Cheng.

   3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
      memory consumed to queue up unsend user data.  From Eric Dumazet.

   4) Add a "physical port ID" abstraction for network devices, from
      Jiri Pirko.

   5) Add a "suppress" operation to influence fib_rules lookups, from
      Stefan Tomanek.

   6) Add a networking development FAQ, from Paul Gortmaker.

   7) Extend the information provided by tcp_probe and add ipv6 support,
      from Daniel Borkmann.

   8) Use RCU locking more extensively in openvswitch data paths, from
      Pravin B Shelar.

   9) Add SCTP support to openvswitch, from Joe Stringer.

  10) Add EF10 chip support to SFC driver, from Ben Hutchings.

  11) Add new SYNPROXY netfilter target, from Patrick McHardy.

  12) Compute a rate approximation for sending in TCP sockets, and use
      this to more intelligently coalesce TSO frames.  Furthermore, add
      a new packet scheduler which takes advantage of this estimate when
      available.  From Eric Dumazet.

  13) Allow AF_PACKET fanouts with random selection, from Daniel
      Borkmann.

  14) Add ipv6 support to vxlan driver, from Cong Wang"

Resolved conflicts as per discussion.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
  openvswitch: Fix alignment of struct sw_flow_key.
  netfilter: Fix build errors with xt_socket.c
  tcp: Add missing braces to do_tcp_setsockopt
  caif: Add missing braces to multiline if in cfctrl_linkup_request
  bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
  vxlan: Fix kernel panic on device delete.
  net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
  net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
  icplus: Use netif_running to determine device state
  ethernet/arc/arc_emac: Fix huge delays in large file copies
  tuntap: orphan frags before trying to set tx timestamp
  tuntap: purge socket error queue on detach
  qlcnic: use standard NAPI weights
  ipv6:introduce function to find route for redirect
  bnx2x: VF RSS support - VF side
  bnx2x: VF RSS support - PF side
  vxlan: Notify drivers for listening UDP port changes
  net: usbnet: update addr_assign_type if appropriate
  driver/net: enic: update enic maintainers and driver
  driver/net: enic: Exposing symbols for Cisco's low latency driver
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index a7e4939787c9..7f910c76ca0a 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1307,11 +1307,11 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
                 }
                 if (fifo2 & 2) {
                         hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B2;
-                        hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS +
+                        hc->hw.int_m1 &= ~(HFCPCI_INTS_B2TRANS |
                                            HFCPCI_INTS_B2REC);
                 } else {
                         hc->hw.fifo_en &= ~HFCPCI_FIFOEN_B1;
-                        hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS +
+                        hc->hw.int_m1 &= ~(HFCPCI_INTS_B1TRANS |
                                            HFCPCI_INTS_B1REC);
                 }
 #ifdef REVERSE_BITORDER
@@ -1346,14 +1346,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
                 if (fifo2 & 2) {
                         hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
                         if (!tics)
-                                hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS +
+                                hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS |
                                                   HFCPCI_INTS_B2REC);
                         hc->hw.ctmt |= 2;
                         hc->hw.conn &= ~0x18;
                 } else {
                         hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
                         if (!tics)
-                                hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS +
+                                hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS |
                                                   HFCPCI_INTS_B1REC);
                         hc->hw.ctmt |= 1;
                         hc->hw.conn &= ~0x03;
@@ -1375,14 +1375,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
                 if (fifo2 & 2) {
                         hc->hw.last_bfifo_cnt[1] = 0;
                         hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
-                        hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS +
+                        hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS |
                                           HFCPCI_INTS_B2REC);
                         hc->hw.ctmt &= ~2;
                         hc->hw.conn &= ~0x18;
                 } else {
                         hc->hw.last_bfifo_cnt[0] = 0;
                         hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
-                        hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS +
+                        hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS |
                                           HFCPCI_INTS_B1REC);
                         hc->hw.ctmt &= ~1;
                         hc->hw.conn &= ~0x03;