On 10/02/2014 09:08 PM, Toshiaki Makita wrote:
> On 2014/10/03 8:54, Vladislav Yasevich wrote:
>> This patch allows the user to set and retrieve default_pvid
>> value. A new value can only be stored when vlan filtering
>> is disabled.
>>
>> Signed-off-by: Vladislav Yasevich <vyasevic@xxxxxxxxxx>
>> ---
> ...
>> +int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val)
>> +{
>> + u16 pvid = val;
>> + int err = 0;
>> +
>> + if (!val || val >= VLAN_VID_MASK)
>> + return -EINVAL;
>> +
>> + if (!rtnl_trylock())
>> + return restart_syscall();
>> +
>> + if (pvid == br->default_pvid)
>> + goto unlock;
>> +
>> + /* Only allow default pvid change when filtering is disabled */
>> + if (br->vlan_enabled) {
>> + pr_info_once("Please disable vlan filtering to change default_pvid\n");
>> + err = -EPERM;
>> + goto unlock;
>> + }
>> +
>> + br->default_pvid = vid;
>
> typo: s/vid/pvid/
How the hell did this even build then...! Oh, the last patch moved it elsewhere and
fixed it.
Fixed.
Thanks
-vlad
>
> Thanks,
> Toshiaki Makita
>
