diff --git a/[refs] b/[refs] index f7c73c177bc1..31b1e3e4918a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f93b9c28326df34b23a6c0dbe4c51d4654bdf0b +refs/heads/master: 16f3051b166bde3f1bd741783b64a8feebdb6f00 diff --git a/trunk/net/8021q/vlanproc.c b/trunk/net/8021q/vlanproc.c index c0040c9064a1..bd08aa090763 100644 --- a/trunk/net/8021q/vlanproc.c +++ b/trunk/net/8021q/vlanproc.c @@ -319,7 +319,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) static const char fmt[] = "%30s %12lu\n"; int i; - if ((vlandev == NULL) || (!(vlandev->priv_flags & IFF_802_1Q_VLAN))) + if (!(vlandev->priv_flags & IFF_802_1Q_VLAN)) return 0; seq_printf(seq, "%s VID: %d REORDER_HDR: %i dev->priv_flags: %hx\n",