diff options
| author | animeshbm | 2024-03-14 13:20:59 +0100 |
|---|---|---|
| committer | GitHub | 2024-03-14 13:20:59 +0100 |
| commit | 211ac5f933e97b3accf935dd6dc92e58cc23dbb6 (patch) | |
| tree | f385c42cc60bdb621bef3c4fe059f7562af0f57b /src/net/vlan.c | |
| parent | support for aqc113 (diff) | |
| parent | [efi] Update to current EDK2 headers (diff) | |
| download | ipxe-211ac5f933e97b3accf935dd6dc92e58cc23dbb6.tar.gz ipxe-211ac5f933e97b3accf935dd6dc92e58cc23dbb6.tar.xz ipxe-211ac5f933e97b3accf935dd6dc92e58cc23dbb6.zip | |
Merge branch 'ipxe:master' into aqc1xx
Diffstat (limited to 'src/net/vlan.c')
| -rw-r--r-- | src/net/vlan.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/net/vlan.c b/src/net/vlan.c index d73a9571..c61bb850 100644 --- a/src/net/vlan.c +++ b/src/net/vlan.c @@ -470,9 +470,10 @@ void vlan_auto ( const void *ll_addr, unsigned int tag ) { * Create automatic VLAN device * * @v trunk Trunk network device + * @v priv Private data * @ret rc Return status code */ -static int vlan_probe ( struct net_device *trunk ) { +static int vlan_probe ( struct net_device *trunk, void *priv __unused ) { int rc; /* Do nothing unless an automatic VLAN exists */ @@ -498,8 +499,9 @@ static int vlan_probe ( struct net_device *trunk ) { * Handle trunk network device link state change * * @v trunk Trunk network device + * @v priv Private data */ -static void vlan_notify ( struct net_device *trunk ) { +static void vlan_notify ( struct net_device *trunk, void *priv __unused ) { struct net_device *netdev; struct vlan_device *vlan; @@ -538,8 +540,9 @@ static int vlan_remove_first ( struct net_device *trunk ) { * Destroy all VLAN devices for a given trunk * * @v trunk Trunk network device + * @v priv Private data */ -static void vlan_remove ( struct net_device *trunk ) { +static void vlan_remove ( struct net_device *trunk, void *priv __unused ) { /* Remove all VLAN devices attached to this trunk, safe * against arbitrary net device removal. |