|author||David S. Miller <email@example.com>||2019-02-15 12:38:38 -0800|
|committer||David S. Miller <firstname.lastname@example.org>||2019-02-15 12:38:38 -0800|
The netfilter conflicts were rather simple overlapping changes. However, the cls_tcindex.c stuff was a bit more complex. On the 'net' side, Cong is fixing several races and memory leaks. Whilst on the 'net-next' side we have Vlad adding the rtnl-ness support. What I've decided to do, in order to resolve this, is revert the conversion over to using a workqueue that Cong did, bringing us back to pure RCU. I did it this way because I believe that either Cong's races don't apply with have Vlad did things, or Cong will have to implement the race fix slightly differently. Signed-off-by: David S. Miller <email@example.com>
Diffstat (limited to 'net/sched/sch_generic.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index e24568f9246c..38e5add14fab 100644
@@ -500,7 +500,7 @@ static void dev_watchdog_down(struct net_device *dev)
* netif_carrier_on - set carrier
* @dev: network device
- * Device has detected that carrier.
+ * Device has detected acquisition of carrier.
void netif_carrier_on(struct net_device *dev)