patch-2.4.8 linux/net/ipv4/af_inet.c
Next file: linux/net/ipv4/icmp.c
Previous file: linux/net/core/sock.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Tue Aug 7 08:30:50 2001
- Orig file:
v2.4.7/linux/net/ipv4/af_inet.c
- Orig date:
Tue Jul 3 17:08:22 2001
diff -u --recursive --new-file v2.4.7/linux/net/ipv4/af_inet.c linux/net/ipv4/af_inet.c
@@ -5,7 +5,7 @@
*
* PF_INET protocol family socket handler.
*
- * Version: $Id: af_inet.c,v 1.131 2001/06/13 16:25:03 davem Exp $
+ * Version: $Id: af_inet.c,v 1.133 2001/08/06 13:21:16 davem Exp $
*
* Authors: Ross Biro, <bir7@leland.Stanford.Edu>
* Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -117,8 +117,6 @@
#include <linux/wireless.h> /* Note : will define WIRELESS_EXT */
#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
-#define min(a,b) ((a)<(b)?(a):(b))
-
struct linux_mib net_statistics[NR_CPUS*2];
#ifdef INET_REFCNT_DEBUG
@@ -882,14 +880,15 @@
if (br_ioctl_hook != NULL)
return br_ioctl_hook(arg);
#endif
+ return -ENOPKG;
+
case SIOCGIFDIVERT:
case SIOCSIFDIVERT:
#ifdef CONFIG_NET_DIVERT
- return(divert_ioctl(cmd, (struct divert_cf *) arg));
+ return divert_ioctl(cmd, (struct divert_cf *) arg);
#else
return -ENOPKG;
#endif /* CONFIG_NET_DIVERT */
- return -ENOPKG;
case SIOCADDDLCI:
case SIOCDELDLCI:
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)