d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

After all the relevant drivers have been fixed, fix vlan(4) itself

Browse Source 
WRT manipulating capabilities of the parent interface:

- use ioctl(SIOCSIFCAP) to toggle VLAN_MTU (the way that was done
  before was just wrong);

- use the right order of conditional clauses to set the MTU fudge
  (that is logically independent from toggling VLAN_MTU.)
This commit is contained in:
yar 2004-05-25 14:30:12 +00:00
parent 3ae386f0f4
commit e01667f2e1
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/net/if_vlan.c
View File

@ -498,30 +498,31 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p)
/*
* If the parent supports the VLAN_MTU capability,
* i.e. can Tx/Rx larger than ETHER_MAX_LEN frames,
* enable it.
* use it.
* First of all, enable Tx/Rx of such extended frames on the
* parent if it's disabled and we're the first to attach.
*/
p->if_nvlans++;
if (p->if_nvlans == 1 && (p->if_capabilities & IFCAP_VLAN_MTU) != 0) {
/*
* Enable Tx/Rx of VLAN-sized frames.
*/
p->if_capenable |= IFCAP_VLAN_MTU;
if (p->if_flags & IFF_UP) {
struct ifreq ifr;
int error;
if (p->if_nvlans == 1 &&
(p->if_capabilities & IFCAP_VLAN_MTU) &&
(p->if_capenable & IFCAP_VLAN_MTU) == 0) {
struct ifreq ifr;
int error;
ifr.ifr_flags = p->if_flags;
error = (*p->if_ioctl)(p, SIOCSIFFLAGS,
(caddr_t) &ifr);
if (error) {
p->if_nvlans--;
if (p->if_nvlans == 0)
p->if_capenable &= ~IFCAP_VLAN_MTU;
return (error);
}
ifr.ifr_reqcap = p->if_capenable | IFCAP_VLAN_MTU;
error = (*p->if_ioctl)(p, SIOCSIFCAP, (caddr_t) &ifr);
if (error) {
p->if_nvlans--;
return (error);
}
}
if (p->if_capenable & IFCAP_VLAN_MTU) {
/*
* No need to fudge the MTU since the parent can
* handle extended frames.
*/
ifv->ifv_mtufudge = 0;
} else if ((p->if_capabilities & IFCAP_VLAN_MTU) == 0) {
} else {
/*
* Fudge the MTU by the encapsulation size. This
* makes us incompatible with strictly compliant
@ -621,16 +622,15 @@ vlan_unconfig(struct ifnet *ifp)
p->if_nvlans--;
if (p->if_nvlans == 0) {
/*
* Disable Tx/Rx of VLAN-sized frames.
*/
p->if_capenable &= ~IFCAP_VLAN_MTU;
if (p->if_flags & IFF_UP) {
struct ifreq ifr;
struct ifreq ifr;
ifr.ifr_flags = p->if_flags;
(*p->if_ioctl)(p, SIOCSIFFLAGS, (caddr_t) &ifr);
}
/*
* Try to disable Tx/Rx of VLAN-sized frames.
* This may have no effect for some interfaces,
* but only the parent driver knows that.
*/
ifr.ifr_reqcap = p->if_capenable & ~IFCAP_VLAN_MTU;
(*p->if_ioctl)(p, SIOCSIFCAP, (caddr_t) &ifr);
}
}