Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 3d1427f87002735aa54c370558e0c2bacc61f31e

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 2975315b79
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ipv4: af_inet.c cleanups 

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 55 additions and 57 deletions Side-by-side Diff

... ... @@ -124,7 +124,6 @@
124 124 static DEFINE_SPINLOCK(inetsw_lock);
125 125  
126 126 struct ipv4_config ipv4_config;
127   -
128 127 EXPORT_SYMBOL(ipv4_config);
129 128  
130 129 /* New destruction routine */
131 130  
... ... @@ -139,12 +138,12 @@
139 138 sk_mem_reclaim(sk);
140 139  
141 140 if (sk->sk_type == SOCK_STREAM && sk->sk_state != TCP_CLOSE) {
142   - printk("Attempt to release TCP socket in state %d %p\n",
  141 + pr_err("Attempt to release TCP socket in state %d %p\n",
143 142 sk->sk_state, sk);
144 143 return;
145 144 }
146 145 if (!sock_flag(sk, SOCK_DEAD)) {
147   - printk("Attempt to release alive inet socket %p\n", sk);
  146 + pr_err("Attempt to release alive inet socket %p\n", sk);
148 147 return;
149 148 }
150 149  
... ... @@ -157,6 +156,7 @@
157 156 dst_release(sk->sk_dst_cache);
158 157 sk_refcnt_debug_dec(sk);
159 158 }
  159 +EXPORT_SYMBOL(inet_sock_destruct);
160 160  
161 161 /*
162 162 * The routines beyond this point handle the behaviour of an AF_INET
... ... @@ -219,6 +219,7 @@
219 219 release_sock(sk);
220 220 return err;
221 221 }
  222 +EXPORT_SYMBOL(inet_listen);
222 223  
223 224 u32 inet_ehash_secret __read_mostly;
224 225 EXPORT_SYMBOL(inet_ehash_secret);
225 226  
... ... @@ -435,9 +436,11 @@
435 436 }
436 437 return 0;
437 438 }
  439 +EXPORT_SYMBOL(inet_release);
438 440  
439 441 /* It is off by default, see below. */
440 442 int sysctl_ip_nonlocal_bind __read_mostly;
  443 +EXPORT_SYMBOL(sysctl_ip_nonlocal_bind);
441 444  
442 445 int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
443 446 {
... ... @@ -519,6 +522,7 @@
519 522 out:
520 523 return err;
521 524 }
  525 +EXPORT_SYMBOL(inet_bind);
522 526  
523 527 int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr,
524 528 int addr_len, int flags)
... ... @@ -532,6 +536,7 @@
532 536 return -EAGAIN;
533 537 return sk->sk_prot->connect(sk, (struct sockaddr *)uaddr, addr_len);
534 538 }
  539 +EXPORT_SYMBOL(inet_dgram_connect);
535 540  
536 541 static long inet_wait_for_connect(struct sock *sk, long timeo)
537 542 {
... ... @@ -641,6 +646,7 @@
641 646 sock->state = SS_DISCONNECTING;
642 647 goto out;
643 648 }
  649 +EXPORT_SYMBOL(inet_stream_connect);
644 650  
645 651 /*
646 652 * Accept a pending connection. The TCP layer now gives BSD semantics.
... ... @@ -668,6 +674,7 @@
668 674 do_err:
669 675 return err;
670 676 }
  677 +EXPORT_SYMBOL(inet_accept);
671 678  
672 679  
673 680 /*
... ... @@ -699,6 +706,7 @@
699 706 *uaddr_len = sizeof(*sin);
700 707 return 0;
701 708 }
  709 +EXPORT_SYMBOL(inet_getname);
702 710  
703 711 int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
704 712 size_t size)
705 713  
... ... @@ -711,9 +719,11 @@
711 719  
712 720 return sk->sk_prot->sendmsg(iocb, sk, msg, size);
713 721 }
  722 +EXPORT_SYMBOL(inet_sendmsg);
714 723  
715 724  
716   -static ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags)
  725 +static ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
  726 + size_t size, int flags)
717 727 {
718 728 struct sock *sk = sock->sk;
719 729  
... ... @@ -780,6 +790,7 @@
780 790 release_sock(sk);
781 791 return err;
782 792 }
  793 +EXPORT_SYMBOL(inet_shutdown);
783 794  
784 795 /*
785 796 * ioctl() calls you can issue on an INET socket. Most of these are
786 797  
... ... @@ -798,44 +809,45 @@
798 809 struct net *net = sock_net(sk);
799 810  
800 811 switch (cmd) {
801   - case SIOCGSTAMP:
802   - err = sock_get_timestamp(sk, (struct timeval __user *)arg);
803   - break;
804   - case SIOCGSTAMPNS:
805   - err = sock_get_timestampns(sk, (struct timespec __user *)arg);
806   - break;
807   - case SIOCADDRT:
808   - case SIOCDELRT:
809   - case SIOCRTMSG:
810   - err = ip_rt_ioctl(net, cmd, (void __user *)arg);
811   - break;
812   - case SIOCDARP:
813   - case SIOCGARP:
814   - case SIOCSARP:
815   - err = arp_ioctl(net, cmd, (void __user *)arg);
816   - break;
817   - case SIOCGIFADDR:
818   - case SIOCSIFADDR:
819   - case SIOCGIFBRDADDR:
820   - case SIOCSIFBRDADDR:
821   - case SIOCGIFNETMASK:
822   - case SIOCSIFNETMASK:
823   - case SIOCGIFDSTADDR:
824   - case SIOCSIFDSTADDR:
825   - case SIOCSIFPFLAGS:
826   - case SIOCGIFPFLAGS:
827   - case SIOCSIFFLAGS:
828   - err = devinet_ioctl(net, cmd, (void __user *)arg);
829   - break;
830   - default:
831   - if (sk->sk_prot->ioctl)
832   - err = sk->sk_prot->ioctl(sk, cmd, arg);
833   - else
834   - err = -ENOIOCTLCMD;
835   - break;
  812 + case SIOCGSTAMP:
  813 + err = sock_get_timestamp(sk, (struct timeval __user *)arg);
  814 + break;
  815 + case SIOCGSTAMPNS:
  816 + err = sock_get_timestampns(sk, (struct timespec __user *)arg);
  817 + break;
  818 + case SIOCADDRT:
  819 + case SIOCDELRT:
  820 + case SIOCRTMSG:
  821 + err = ip_rt_ioctl(net, cmd, (void __user *)arg);
  822 + break;
  823 + case SIOCDARP:
  824 + case SIOCGARP:
  825 + case SIOCSARP:
  826 + err = arp_ioctl(net, cmd, (void __user *)arg);
  827 + break;
  828 + case SIOCGIFADDR:
  829 + case SIOCSIFADDR:
  830 + case SIOCGIFBRDADDR:
  831 + case SIOCSIFBRDADDR:
  832 + case SIOCGIFNETMASK:
  833 + case SIOCSIFNETMASK:
  834 + case SIOCGIFDSTADDR:
  835 + case SIOCSIFDSTADDR:
  836 + case SIOCSIFPFLAGS:
  837 + case SIOCGIFPFLAGS:
  838 + case SIOCSIFFLAGS:
  839 + err = devinet_ioctl(net, cmd, (void __user *)arg);
  840 + break;
  841 + default:
  842 + if (sk->sk_prot->ioctl)
  843 + err = sk->sk_prot->ioctl(sk, cmd, arg);
  844 + else
  845 + err = -ENOIOCTLCMD;
  846 + break;
836 847 }
837 848 return err;
838 849 }
  850 +EXPORT_SYMBOL(inet_ioctl);
839 851  
840 852 const struct proto_ops inet_stream_ops = {
841 853 .family = PF_INET,
... ... @@ -862,6 +874,7 @@
862 874 .compat_getsockopt = compat_sock_common_getsockopt,
863 875 #endif
864 876 };
  877 +EXPORT_SYMBOL(inet_stream_ops);
865 878  
866 879 const struct proto_ops inet_dgram_ops = {
867 880 .family = PF_INET,
... ... @@ -887,6 +900,7 @@
887 900 .compat_getsockopt = compat_sock_common_getsockopt,
888 901 #endif
889 902 };
  903 +EXPORT_SYMBOL(inet_dgram_ops);
890 904  
891 905 /*
892 906 * For SOCK_RAW sockets; should be the same as inet_dgram_ops but without
... ... @@ -1016,6 +1030,7 @@
1016 1030 p->type);
1017 1031 goto out;
1018 1032 }
  1033 +EXPORT_SYMBOL(inet_register_protosw);
1019 1034  
1020 1035 void inet_unregister_protosw(struct inet_protosw *p)
1021 1036 {
... ... @@ -1031,6 +1046,7 @@
1031 1046 synchronize_net();
1032 1047 }
1033 1048 }
  1049 +EXPORT_SYMBOL(inet_unregister_protosw);
1034 1050  
1035 1051 /*
1036 1052 * Shall we try to damage output packets if routing dev changes?
... ... @@ -1141,7 +1157,6 @@
1141 1157  
1142 1158 return err;
1143 1159 }
1144   -
1145 1160 EXPORT_SYMBOL(inet_sk_rebuild_header);
1146 1161  
1147 1162 static int inet_gso_send_check(struct sk_buff *skb)
... ... @@ -1369,7 +1384,6 @@
1369 1384 }
1370 1385 return rc;
1371 1386 }
1372   -
1373 1387 EXPORT_SYMBOL_GPL(inet_ctl_sock_create);
1374 1388  
1375 1389 unsigned long snmp_fold_field(void *mib[], int offt)
... ... @@ -1675,21 +1689,4 @@
1675 1689 #endif /* CONFIG_PROC_FS */
1676 1690  
1677 1691 MODULE_ALIAS_NETPROTO(PF_INET);
1678   -
1679   -EXPORT_SYMBOL(inet_accept);
1680   -EXPORT_SYMBOL(inet_bind);
1681   -EXPORT_SYMBOL(inet_dgram_connect);
1682   -EXPORT_SYMBOL(inet_dgram_ops);
1683   -EXPORT_SYMBOL(inet_getname);
1684   -EXPORT_SYMBOL(inet_ioctl);
1685   -EXPORT_SYMBOL(inet_listen);
1686   -EXPORT_SYMBOL(inet_register_protosw);
1687   -EXPORT_SYMBOL(inet_release);
1688   -EXPORT_SYMBOL(inet_sendmsg);
1689   -EXPORT_SYMBOL(inet_shutdown);
1690   -EXPORT_SYMBOL(inet_sock_destruct);
1691   -EXPORT_SYMBOL(inet_stream_connect);
1692   -EXPORT_SYMBOL(inet_stream_ops);
1693   -EXPORT_SYMBOL(inet_unregister_protosw);
1694   -EXPORT_SYMBOL(sysctl_ip_nonlocal_bind);