Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
hsr
/
hsr_device.c
diff --git
a/kernel/net/hsr/hsr_device.c
b/kernel/net/hsr/hsr_device.c
index
44d2746
..
c7d1adc
100644
(file)
--- a/
kernel/net/hsr/hsr_device.c
+++ b/
kernel/net/hsr/hsr_device.c
@@
-312,7
+312,7
@@
static void send_hsr_supervision_frame(struct hsr_port *master, u8 type)
return;
out:
return;
out:
- WARN_ON
_ONCE(
"HSR: Could not send supervision frame\n");
+ WARN_ON
CE(1,
"HSR: Could not send supervision frame\n");
kfree_skb(skb);
}
kfree_skb(skb);
}
@@
-392,7
+392,7
@@
void hsr_dev_setup(struct net_device *dev)
dev->header_ops = &hsr_header_ops;
dev->netdev_ops = &hsr_device_ops;
SET_NETDEV_DEVTYPE(dev, &hsr_type);
dev->header_ops = &hsr_header_ops;
dev->netdev_ops = &hsr_device_ops;
SET_NETDEV_DEVTYPE(dev, &hsr_type);
- dev->
tx_queue_len = 0
;
+ dev->
priv_flags |= IFF_NO_QUEUE
;
dev->destructor = hsr_dev_destroy;
dev->destructor = hsr_dev_destroy;