]> Pileus Git - ~andy/linux/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 22:56:43 +0000 (15:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 5 Jun 2013 23:37:30 +0000 (16:37 -0700)
Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.

This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge.  Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.

Signed-off-by: David S. Miller <davem@davemloft.net>
24 files changed:
1  2 
arch/arm/configs/omap2plus_defconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/broadcom/tg3.h
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_hw.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/qlogic/qlge/qlge_main.c
drivers/net/ethernet/xilinx/xilinx_emaclite.c
drivers/net/phy/phy.c
drivers/net/team/team.c
include/linux/skbuff.h
include/net/ping.h
net/core/skbuff.c
net/ipv4/ip_tunnel.c
net/ipv4/route.c
net/ipv6/addrconf.c
net/ipv6/ping.c
net/ipv6/udp_offload.c
net/mac80211/iface.c
net/sched/sch_tbf.c
net/xfrm/xfrm_policy.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index db04802f1673573a919e79db08984274031dbaf3,682b5ae9af5165dcc71b4f366c81db7a4df20c01..5db0224b73ac47b1513ffb9361e48aa0167bb24d
   */
  #define GID_T_MAX (((gid_t)~0U) >> 1)
  
-                            struct net_device *dev, int strict);
 +/* Compatibility glue so we can support IPv6 when it's compiled as a module */
 +struct pingv6_ops {
 +      int (*ipv6_recv_error)(struct sock *sk, struct msghdr *msg, int len);
 +      int (*ip6_datagram_recv_ctl)(struct sock *sk, struct msghdr *msg,
 +                                   struct sk_buff *skb);
 +      int (*icmpv6_err_convert)(u8 type, u8 code, int *err);
 +      void (*ipv6_icmp_error)(struct sock *sk, struct sk_buff *skb, int err,
 +                              __be16 port, u32 info, u8 *payload);
 +      int (*ipv6_chk_addr)(struct net *net, const struct in6_addr *addr,
++                           const struct net_device *dev, int strict);
 +};
 +
  struct ping_table {
        struct hlist_nulls_head hash[PING_HTABLE_SIZE];
        rwlock_t                lock;
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/ping.c
index 62ac5f2e0aaf232708a4753abcb0e9adb3a8f602,0000000000000000000000000000000000000000..a43110385918975136f46e93e15f217e49fa7365
mode 100644,000000..100644
--- /dev/null
@@@ -1,272 -1,0 +1,272 @@@
-                       struct net_device *dev, int strict)
 +/*
 + * INET               An implementation of the TCP/IP protocol suite for the LINUX
 + *            operating system.  INET is implemented using the  BSD Socket
 + *            interface as the means of communication with the user level.
 + *
 + *            "Ping" sockets
 + *
 + *            This program is free software; you can redistribute it and/or
 + *            modify it under the terms of the GNU General Public License
 + *            as published by the Free Software Foundation; either version
 + *            2 of the License, or (at your option) any later version.
 + *
 + * Based on ipv4/ping.c code.
 + *
 + * Authors:   Lorenzo Colitti (IPv6 support)
 + *            Vasiliy Kulikov / Openwall (IPv4 implementation, for Linux 2.6),
 + *            Pavel Kankovsky (IPv4 implementation, for Linux 2.4.32)
 + *
 + */
 +
 +#include <net/addrconf.h>
 +#include <net/ipv6.h>
 +#include <net/ip6_route.h>
 +#include <net/protocol.h>
 +#include <net/udp.h>
 +#include <net/transp_v6.h>
 +#include <net/ping.h>
 +
 +struct proto pingv6_prot = {
 +      .name =         "PINGv6",
 +      .owner =        THIS_MODULE,
 +      .init =         ping_init_sock,
 +      .close =        ping_close,
 +      .connect =      ip6_datagram_connect,
 +      .disconnect =   udp_disconnect,
 +      .setsockopt =   ipv6_setsockopt,
 +      .getsockopt =   ipv6_getsockopt,
 +      .sendmsg =      ping_v6_sendmsg,
 +      .recvmsg =      ping_recvmsg,
 +      .bind =         ping_bind,
 +      .backlog_rcv =  ping_queue_rcv_skb,
 +      .hash =         ping_hash,
 +      .unhash =       ping_unhash,
 +      .get_port =     ping_get_port,
 +      .obj_size =     sizeof(struct raw6_sock),
 +};
 +EXPORT_SYMBOL_GPL(pingv6_prot);
 +
 +static struct inet_protosw pingv6_protosw = {
 +      .type =      SOCK_DGRAM,
 +      .protocol =  IPPROTO_ICMPV6,
 +      .prot =      &pingv6_prot,
 +      .ops =       &inet6_dgram_ops,
 +      .no_check =  UDP_CSUM_DEFAULT,
 +      .flags =     INET_PROTOSW_REUSE,
 +};
 +
 +
 +/* Compatibility glue so we can support IPv6 when it's compiled as a module */
 +int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
 +{
 +      return -EAFNOSUPPORT;
 +}
 +int dummy_ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
 +                               struct sk_buff *skb)
 +{
 +      return -EAFNOSUPPORT;
 +}
 +int dummy_icmpv6_err_convert(u8 type, u8 code, int *err)
 +{
 +      return -EAFNOSUPPORT;
 +}
 +void dummy_ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
 +                          __be16 port, u32 info, u8 *payload) {}
 +int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
++                      const struct net_device *dev, int strict)
 +{
 +      return 0;
 +}
 +
 +int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 +                  size_t len)
 +{
 +      struct inet_sock *inet = inet_sk(sk);
 +      struct ipv6_pinfo *np = inet6_sk(sk);
 +      struct icmp6hdr user_icmph;
 +      int addr_type;
 +      struct in6_addr *daddr;
 +      int iif = 0;
 +      struct flowi6 fl6;
 +      int err;
 +      int hlimit;
 +      struct dst_entry *dst;
 +      struct rt6_info *rt;
 +      struct pingfakehdr pfh;
 +
 +      pr_debug("ping_v6_sendmsg(sk=%p,sk->num=%u)\n", inet, inet->inet_num);
 +
 +      err = ping_common_sendmsg(AF_INET6, msg, len, &user_icmph,
 +                                sizeof(user_icmph));
 +      if (err)
 +              return err;
 +
 +      if (msg->msg_name) {
 +              struct sockaddr_in6 *u = (struct sockaddr_in6 *) msg->msg_name;
 +              if (msg->msg_namelen < sizeof(struct sockaddr_in6) ||
 +                  u->sin6_family != AF_INET6) {
 +                      return -EINVAL;
 +              }
 +              if (sk->sk_bound_dev_if &&
 +                  sk->sk_bound_dev_if != u->sin6_scope_id) {
 +                      return -EINVAL;
 +              }
 +              daddr = &(u->sin6_addr);
 +              iif = u->sin6_scope_id;
 +      } else {
 +              if (sk->sk_state != TCP_ESTABLISHED)
 +                      return -EDESTADDRREQ;
 +              daddr = &np->daddr;
 +      }
 +
 +      if (!iif)
 +              iif = sk->sk_bound_dev_if;
 +
 +      addr_type = ipv6_addr_type(daddr);
 +      if (__ipv6_addr_needs_scope_id(addr_type) && !iif)
 +              return -EINVAL;
 +      if (addr_type & IPV6_ADDR_MAPPED)
 +              return -EINVAL;
 +
 +      /* TODO: use ip6_datagram_send_ctl to get options from cmsg */
 +
 +      memset(&fl6, 0, sizeof(fl6));
 +
 +      fl6.flowi6_proto = IPPROTO_ICMPV6;
 +      fl6.saddr = np->saddr;
 +      fl6.daddr = *daddr;
 +      fl6.fl6_icmp_type = user_icmph.icmp6_type;
 +      fl6.fl6_icmp_code = user_icmph.icmp6_code;
 +      security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 +
 +      if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
 +              fl6.flowi6_oif = np->mcast_oif;
 +      else if (!fl6.flowi6_oif)
 +              fl6.flowi6_oif = np->ucast_oif;
 +
 +      dst = ip6_sk_dst_lookup_flow(sk, &fl6,  daddr, 1);
 +      if (IS_ERR(dst))
 +              return PTR_ERR(dst);
 +      rt = (struct rt6_info *) dst;
 +
 +      np = inet6_sk(sk);
 +      if (!np)
 +              return -EBADF;
 +
 +      if (!fl6.flowi6_oif && ipv6_addr_is_multicast(&fl6.daddr))
 +              fl6.flowi6_oif = np->mcast_oif;
 +      else if (!fl6.flowi6_oif)
 +              fl6.flowi6_oif = np->ucast_oif;
 +
 +      pfh.icmph.type = user_icmph.icmp6_type;
 +      pfh.icmph.code = user_icmph.icmp6_code;
 +      pfh.icmph.checksum = 0;
 +      pfh.icmph.un.echo.id = inet->inet_sport;
 +      pfh.icmph.un.echo.sequence = user_icmph.icmp6_sequence;
 +      pfh.iov = msg->msg_iov;
 +      pfh.wcheck = 0;
 +      pfh.family = AF_INET6;
 +
 +      if (ipv6_addr_is_multicast(&fl6.daddr))
 +              hlimit = np->mcast_hops;
 +      else
 +              hlimit = np->hop_limit;
 +      if (hlimit < 0)
 +              hlimit = ip6_dst_hoplimit(dst);
 +
 +      err = ip6_append_data(sk, ping_getfrag, &pfh, len,
 +                            0, hlimit,
 +                            np->tclass, NULL, &fl6, rt,
 +                            MSG_DONTWAIT, np->dontfrag);
 +
 +      if (err) {
 +              ICMP6_INC_STATS_BH(sock_net(sk), rt->rt6i_idev,
 +                                 ICMP6_MIB_OUTERRORS);
 +              ip6_flush_pending_frames(sk);
 +      } else {
 +              err = icmpv6_push_pending_frames(sk, &fl6,
 +                                               (struct icmp6hdr *) &pfh.icmph,
 +                                               len);
 +      }
 +
 +      return err;
 +}
 +
 +#ifdef CONFIG_PROC_FS
 +static void *ping_v6_seq_start(struct seq_file *seq, loff_t *pos)
 +{
 +      return ping_seq_start(seq, pos, AF_INET6);
 +}
 +
 +int ping_v6_seq_show(struct seq_file *seq, void *v)
 +{
 +      if (v == SEQ_START_TOKEN) {
 +              seq_puts(seq, IPV6_SEQ_DGRAM_HEADER);
 +      } else {
 +              int bucket = ((struct ping_iter_state *) seq->private)->bucket;
 +              struct inet_sock *inet = inet_sk(v);
 +              __u16 srcp = ntohs(inet->inet_sport);
 +              __u16 destp = ntohs(inet->inet_dport);
 +              ip6_dgram_sock_seq_show(seq, v, srcp, destp, bucket);
 +      }
 +      return 0;
 +}
 +
 +static struct ping_seq_afinfo ping_v6_seq_afinfo = {
 +      .name           = "icmp6",
 +      .family         = AF_INET6,
 +      .seq_fops       = &ping_seq_fops,
 +      .seq_ops        = {
 +              .start          = ping_v6_seq_start,
 +              .show           = ping_v6_seq_show,
 +              .next           = ping_seq_next,
 +              .stop           = ping_seq_stop,
 +      },
 +};
 +
 +static int __net_init ping_v6_proc_init_net(struct net *net)
 +{
 +      return ping_proc_register(net, &ping_v6_seq_afinfo);
 +}
 +
 +static void __net_init ping_v6_proc_exit_net(struct net *net)
 +{
 +      return ping_proc_unregister(net, &ping_v6_seq_afinfo);
 +}
 +
 +static struct pernet_operations ping_v6_net_ops = {
 +      .init = ping_v6_proc_init_net,
 +      .exit = ping_v6_proc_exit_net,
 +};
 +#endif
 +
 +int __init pingv6_init(void)
 +{
 +#ifdef CONFIG_PROC_FS
 +      int ret = register_pernet_subsys(&ping_v6_net_ops);
 +      if (ret)
 +              return ret;
 +#endif
 +      pingv6_ops.ipv6_recv_error = ipv6_recv_error;
 +      pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl;
 +      pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
 +      pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
 +      pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
 +      return inet6_register_protosw(&pingv6_protosw);
 +}
 +
 +/* This never gets called because it's not possible to unload the ipv6 module,
 + * but just in case.
 + */
 +void pingv6_exit(void)
 +{
 +      pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
 +      pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl;
 +      pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
 +      pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
 +      pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
 +#ifdef CONFIG_PROC_FS
 +      unregister_pernet_subsys(&ping_v6_net_ops);
 +#endif
 +      inet6_unregister_protosw(&pingv6_protosw);
 +}
Simple merge
Simple merge
Simple merge
Simple merge