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

Pull networking fixes from David Miller:

 1) Clear up some recent tipc regressions because of registration
    ordering. Fix from Junwei Hu.

 2) tipc's TLV_SET() can read past the end of the supplied buffer during
    the copy. From Chris Packham.

 3) ptp example program doesn't match the kernel, from Richard Cochran.

 4) Outgoing message type fix in qrtr, from Bjorn Andersson.

 5) Flow control regression in stmmac, from Tan Tee Min.

 6) Fix inband autonegotiation in phylink, from Russell King.

 7) Fix sk_bound_dev_if handling in rawv6_bind(), from Mike Manning.

 8) Fix usbnet crash after disconnect, from Kloetzke Jan.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (21 commits)
  usbnet: fix kernel crash after disconnect
  selftests: fib_rule_tests: use pre-defined DEV_ADDR
  net-next: net: Fix typos in ip-sysctl.txt
  ipv6: Consider sk_bound_dev_if when binding a raw socket to an address
  net: phylink: ensure inband AN works correctly
  usbnet: ipheth: fix racing condition
  net: stmmac: dma channel control register need to be init first
  net: stmmac: fix ethtool flow control not able to get/set
  net: qrtr: Fix message type of outgoing packets
  networking: : fix typos in code comments
  ptp: Fix example program to match kernel.
  fddi: fix typos in code comments
  selftests: fib_rule_tests: enable forwarding before ipv4 from/iif test
  selftests: fib_rule_tests: fix local IPv4 address typo
  tipc: Avoid copying bytes beyond the supplied data
  2/2] net: xilinx_emaclite: use readx_poll_timeout() in mdio wait function
  1/2] net: axienet: use readx_poll_timeout() in mdio wait function
  vlan: Mark expected switch fall-through
  macvlan: Mark expected switch fall-through
  net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query
  ...

2 files changed, 9 insertions, 86 deletions

diff --git a/tools/testing/selftests/net/fib_rule_tests.sh b/tools/testing/selftests/net/fib_rule_tests.sh
index 4b7e107865bf..a93e6b690e06 100755
--- a/tools/testing/selftests/net/fib_rule_tests.sh
+++ b/tools/testing/selftests/net/fib_rule_tests.sh
@@ -15,6 +15,7 @@ GW_IP6=2001:db8:1::2
 SRC_IP6=2001:db8:1::3
 
 DEV_ADDR=192.51.100.1
+DEV_ADDR6=2001:db8:1::1
 DEV=dummy0
 
 log_test()
@@ -55,8 +56,8 @@ setup()
 
         $IP link add dummy0 type dummy
         $IP link set dev dummy0 up
-        $IP address add 198.51.100.1/24 dev dummy0
-        $IP -6 address add 2001:db8:1::1/64 dev dummy0
+        $IP address add $DEV_ADDR/24 dev dummy0
+        $IP -6 address add $DEV_ADDR6/64 dev dummy0
 
         set +e
 }
@@ -186,8 +187,13 @@ fib_rule4_test()
         match="oif $DEV"
         fib_rule4_test_match_n_redirect "$match" "$match" "oif redirect to table"
 
+        # need enable forwarding and disable rp_filter temporarily as all the
+        # addresses are in the same subnet and egress device == ingress device.
+        ip netns exec testns sysctl -w net.ipv4.ip_forward=1
+        ip netns exec testns sysctl -w net.ipv4.conf.$DEV.rp_filter=0
         match="from $SRC_IP iif $DEV"
         fib_rule4_test_match_n_redirect "$match" "$match" "iif redirect to table"
+        ip netns exec testns sysctl -w net.ipv4.ip_forward=0
 
         match="tos 0x10"
         fib_rule4_test_match_n_redirect "$match" "$match" "tos redirect to table"
diff --git a/tools/testing/selftests/ptp/testptp.c b/tools/testing/selftests/ptp/testptp.c
index a5d8f0ab0da0..6216375cb544 100644
--- a/tools/testing/selftests/ptp/testptp.c
+++ b/tools/testing/selftests/ptp/testptp.c
@@ -63,30 +63,6 @@ static clockid_t get_clockid(int fd)
         return (((unsigned int) ~fd) << 3) | CLOCKFD;
 }
 
-static void handle_alarm(int s)
-{
-        printf("received signal %d\n", s);
-}
-
-static int install_handler(int signum, void (*handler)(int))
-{
-        struct sigaction action;
-        sigset_t mask;
-
-        /* Unblock the signal. */
-        sigemptyset(&mask);
-        sigaddset(&mask, signum);
-        sigprocmask(SIG_UNBLOCK, &mask, NULL);
-
-        /* Install the signal handler. */
-        action.sa_handler = handler;
-        action.sa_flags = 0;
-        sigemptyset(&action.sa_mask);
-        sigaction(signum, &action, NULL);
-
-        return 0;
-}
-
 static long ppb_to_scaled_ppm(int ppb)
 {
         /*
@@ -112,8 +88,6 @@ static void usage(char *progname)
 {
         fprintf(stderr,
                 "usage: %s [options]\n"
-                " -a val     request a one-shot alarm after 'val' seconds\n"
-                " -A val     request a periodic alarm every 'val' seconds\n"
                 " -c         query the ptp clock's capabilities\n"
                 " -d name    device to open\n"
                 " -e val     read 'val' external time stamp events\n"
@@ -148,15 +122,9 @@ int main(int argc, char *argv[])
         struct ptp_pin_desc desc;
         struct timespec ts;
         struct timex tx;
-
-        static timer_t timerid;
-        struct itimerspec timeout;
-        struct sigevent sigevent;
-
         struct ptp_clock_time *pct;
         struct ptp_sys_offset *sysoff;
 
-
         char *progname;
         unsigned int i;
         int c, cnt, fd;
@@ -170,10 +138,8 @@ int main(int argc, char *argv[])
         int gettime = 0;
         int index = 0;
         int list_pins = 0;
-        int oneshot = 0;
         int pct_offset = 0;
         int n_samples = 0;
-        int periodic = 0;
         int perout = -1;
         int pin_index = -1, pin_func;
         int pps = -1;
@@ -185,14 +151,8 @@ int main(int argc, char *argv[])
 
         progname = strrchr(argv[0], '/');
         progname = progname ? 1+progname : argv[0];
-        while (EOF != (c = getopt(argc, argv, "a:A:cd:e:f:ghi:k:lL:p:P:sSt:T:v"))) {
+        while (EOF != (c = getopt(argc, argv, "cd:e:f:ghi:k:lL:p:P:sSt:T:v"))) {
                 switch (c) {
-                case 'a':
-                        oneshot = atoi(optarg);
-                        break;
-                case 'A':
-                        periodic = atoi(optarg);
-                        break;
                 case 'c':
                         capabilities = 1;
                         break;
@@ -393,49 +353,6 @@ int main(int argc, char *argv[])
                 }
         }
 
-        if (oneshot) {
-                install_handler(SIGALRM, handle_alarm);
-                /* Create a timer. */
-                sigevent.sigev_notify = SIGEV_SIGNAL;
-                sigevent.sigev_signo = SIGALRM;
-                if (timer_create(clkid, &sigevent, &timerid)) {
-                        perror("timer_create");
-                        return -1;
-                }
-                /* Start the timer. */
-                memset(&timeout, 0, sizeof(timeout));
-                timeout.it_value.tv_sec = oneshot;
-                if (timer_settime(timerid, 0, &timeout, NULL)) {
-                        perror("timer_settime");
-                        return -1;
-                }
-                pause();
-                timer_delete(timerid);
-        }
-
-        if (periodic) {
-                install_handler(SIGALRM, handle_alarm);
-                /* Create a timer. */
-                sigevent.sigev_notify = SIGEV_SIGNAL;
-                sigevent.sigev_signo = SIGALRM;
-                if (timer_create(clkid, &sigevent, &timerid)) {
-                        perror("timer_create");
-                        return -1;
-                }
-                /* Start the timer. */
-                memset(&timeout, 0, sizeof(timeout));
-                timeout.it_interval.tv_sec = periodic;
-                timeout.it_value.tv_sec = periodic;
-                if (timer_settime(timerid, 0, &timeout, NULL)) {
-                        perror("timer_settime");
-                        return -1;
-                }
-                while (1) {
-                        pause();
-                }
-                timer_delete(timerid);
-        }
-
         if (perout >= 0) {
                 if (clock_gettime(clkid, &ts)) {
                         perror("clock_gettime");