Author: rwatson
Date: Mon Mar 16 17:57:29 2009
New Revision: 189894
URL: http://svn.freebsd.org/changeset/base/189894
Log:
Merge r188546 from head to stable/7:
Remove unused ifaddr local variable in ioctl routine.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/net/if_vlan.c
Modified: stable/7/sys/net/if_vlan.c
==============================================================================
--- stable/7/sys/net/if_vlan.c Mon Mar 16 17:55:24 2009 (r189893)
+++ stable/7/sys/net/if_vlan.c Mon Mar 16 17:57:29 2009 (r189894)
@@ -1296,7 +1296,6 @@ vlan_trunk_capabilities(struct ifnet *if
static int
vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
- struct ifaddr *ifa;
struct ifnet *p;
struct ifreq *ifr;
struct ifvlan *ifv;
@@ -1304,7 +1303,6 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd
int error = 0;
ifr = (struct ifreq *)data;
- ifa = (struct ifaddr *)data;
ifv = ifp->if_softc;
switch (cmd) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
