浏览代码

[NETFILTER]: bridge netfilter: use non-deprecated __RW_LOCK_UNLOCKED macro.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Robert P. J. Day 17 年之前
父节点
当前提交
0718300c06
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      net/bridge/netfilter/ebtable_broute.c
  2. 1 1
      net/bridge/netfilter/ebtable_filter.c
  3. 1 1
      net/bridge/netfilter/ebtable_nat.c

+ 1 - 1
net/bridge/netfilter/ebtable_broute.c

@@ -46,7 +46,7 @@ static struct ebt_table broute_table =
 	.name		= "broute",
 	.name		= "broute",
 	.table		= &initial_table,
 	.table		= &initial_table,
 	.valid_hooks	= 1 << NF_BR_BROUTING,
 	.valid_hooks	= 1 << NF_BR_BROUTING,
-	.lock		= RW_LOCK_UNLOCKED,
+	.lock		= __RW_LOCK_UNLOCKED(broute_table.lock),
 	.check		= check,
 	.check		= check,
 	.me		= THIS_MODULE,
 	.me		= THIS_MODULE,
 };
 };

+ 1 - 1
net/bridge/netfilter/ebtable_filter.c

@@ -55,7 +55,7 @@ static struct ebt_table frame_filter =
 	.name		= "filter",
 	.name		= "filter",
 	.table		= &initial_table,
 	.table		= &initial_table,
 	.valid_hooks	= FILTER_VALID_HOOKS,
 	.valid_hooks	= FILTER_VALID_HOOKS,
-	.lock		= RW_LOCK_UNLOCKED,
+	.lock		= __RW_LOCK_UNLOCKED(frame_filter.lock),
 	.check		= check,
 	.check		= check,
 	.me		= THIS_MODULE,
 	.me		= THIS_MODULE,
 };
 };

+ 1 - 1
net/bridge/netfilter/ebtable_nat.c

@@ -55,7 +55,7 @@ static struct ebt_table frame_nat =
 	.name		= "nat",
 	.name		= "nat",
 	.table		= &initial_table,
 	.table		= &initial_table,
 	.valid_hooks	= NAT_VALID_HOOKS,
 	.valid_hooks	= NAT_VALID_HOOKS,
-	.lock		= RW_LOCK_UNLOCKED,
+	.lock		= __RW_LOCK_UNLOCKED(frame_nat.lock),
 	.check		= check,
 	.check		= check,
 	.me		= THIS_MODULE,
 	.me		= THIS_MODULE,
 };
 };