diff options
| author | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 20:22:14 +0100 |
|---|---|---|
| committer | Mike Marshall <hubcap@omnibond.com> | 2016-01-15 20:22:14 +0100 |
| commit | 5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch) | |
| tree | b262a7c002b05b7bc800a106d6ca6777dabe15bf /drivers/net/wan/hdlc_fr.c | |
| parent | Orangefs: add verification to decode_dirents (diff) | |
| parent | Linux 4.4 (diff) | |
| download | linux-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.xz linux-5e1f3938f9e4ef539031d639879cb1cea870fab5.zip | |
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current
Linux 4.4
Diffstat (limited to 'drivers/net/wan/hdlc_fr.c')
| -rw-r--r-- | drivers/net/wan/hdlc_fr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index e92aaf615901..89541cc90e87 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -1075,11 +1075,10 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) used = pvc_is_used(pvc); - if (type == ARPHRD_ETHER) { + if (type == ARPHRD_ETHER) dev = alloc_netdev(0, "pvceth%d", NET_NAME_UNKNOWN, ether_setup); - dev->priv_flags &= ~IFF_TX_SKB_SHARING; - } else + else dev = alloc_netdev(0, "pvc%d", NET_NAME_UNKNOWN, pvc_setup); if (!dev) { @@ -1088,9 +1087,10 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) return -ENOBUFS; } - if (type == ARPHRD_ETHER) + if (type == ARPHRD_ETHER) { + dev->priv_flags &= ~IFF_TX_SKB_SHARING; eth_hw_addr_random(dev); - else { + } else { *(__be16*)dev->dev_addr = htons(dlci); dlci_to_q922(dev->broadcast, dlci); } |