ifconfig: Deprecate "pollcpu" and make "polling" same as "polling"

diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 2cac300..287afc8 100644 (file)
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -28,7 +28,7 @@
 .\"     From: @(#)ifconfig.8   8.3 (Berkeley) 1/5/94
 .\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.124 2006/10/10 09:44:08 ru Exp $
 .\"
-.Dd July 17, 2010
+.Dd Nov 12, 2012
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -356,21 +356,13 @@ If the driver offers user-configurable VLAN support, disable
 reception of extended frames or tag processing in hardware,
 respectively.
 .It Cm pollcpu Ar cpu
-Turn on
-.Xr polling 4
-feature and disable interrupts on the interface,
-if the driver supports this mode and
-.Ar cpu
-supports
-.Xr polling 4 .
-Driver will be polled by
-.Ar cpu .
-.It Cm polling
+Deprecated, use polling or npolling instead.
+.It Cm polling , npolling
 Turn on
 .Xr polling 4
 feature and disable interrupts on the interface, if the driver supports
 this mode.
-.It Fl polling
+.It Fl polling , npolling
 Turn off
 .Xr polling 4
 feature and enable interrupt mode on the interface.

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 2d79d1c..c551348 100644 (file)
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -847,21 +847,8 @@ static void
 setifpollcpu(const char *val, int dummy __unused, int s, 
     const struct afswtch *afp)
 {
-       int pollcpu;
-
-       pollcpu = atoi(val);
-       if (pollcpu < 0) {
-               warn("pollcpu < 0");
-               return;
-       }
-
-       setifflags("-polling", -IFF_POLLING, s, afp);
-
-       ifr.ifr_pollcpu = pollcpu;
-       if (ioctl(s, SIOCSIFPOLLCPU, (caddr_t)&ifr) < 0) {
-               warn("ioctl (set pollcpu)");
-               return;
-       }
+       warnx("pollcpu is deprecated, use polling or npolling instead");
+       setifflags("npolling", IFF_NPOLLING, s, afp);
 }
 
 /*
@@ -978,11 +965,6 @@ status(const struct afswtch *afp, int addrcount, struct    sockaddr_dl *sdl,
        if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) 
                printf("%s", ifs.ascii);
 
-       if (flags & IFF_POLLING) {
-               if (ioctl(s, SIOCGIFPOLLCPU, &ifr) == 0 && ifr.ifr_pollcpu >= 0)
-                       printf("\tpollcpu: %d\n", ifr.ifr_pollcpu);
-       }
-
        close(s);
        return;
 }
@@ -1120,8 +1102,8 @@ static struct cmd basic_cmds[] = {
        DEF_CMD("-monitor",     -IFF_MONITOR,   setifflags),
        DEF_CMD("staticarp",    IFF_STATICARP,  setifflags),
        DEF_CMD("-staticarp",   -IFF_STATICARP, setifflags),
-       DEF_CMD("polling",      IFF_POLLING,    setifflags),
-       DEF_CMD("-polling",     -IFF_POLLING,   setifflags),
+       DEF_CMD("polling",      IFF_NPOLLING,   setifflags),
+       DEF_CMD("-polling",     -IFF_NPOLLING,  setifflags),
        DEF_CMD("npolling",     IFF_NPOLLING,   setifflags),
        DEF_CMD("-npolling",    -IFF_NPOLLING,  setifflags),
        DEF_CMD("rxcsum",       IFCAP_RXCSUM,   setifcap),