aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2013-06-13 02:23:35 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-13 04:23:11 -0400
commitd9a90a3105eb6ca89aab74223e6526ab4a5e44b5 (patch)
tree408690604b3351cf2c898a057c08437e2dc97827
parent2c928e0e8dd6b3661870bfacb53d1c330a1a7411 (diff)
macvtap: slient sparse warnings
This patch silents the following sparse warnings: drivers/net/macvtap.c:98:9: warning: incorrect type in assignment (different address spaces) drivers/net/macvtap.c:98:9: expected struct macvtap_queue *<noident> drivers/net/macvtap.c:98:9: got struct macvtap_queue [noderef] <asn:4>*<noident> drivers/net/macvtap.c:120:9: warning: incorrect type in assignment (different address spaces) drivers/net/macvtap.c:120:9: expected struct macvtap_queue *<noident> drivers/net/macvtap.c:120:9: got struct macvtap_queue [noderef] <asn:4>*<noident> drivers/net/macvtap.c:151:22: error: incompatible types in comparison expression (different address spaces) drivers/net/macvtap.c:233:23: error: incompatible types in comparison expression (different address spaces) drivers/net/macvtap.c:243:23: error: incompatible types in comparison expression (different address spaces) drivers/net/macvtap.c:247:15: error: incompatible types in comparison expression (different address spaces) CC [M] drivers/net/macvtap.o drivers/net/macvlan.c:232:24: error: incompatible types in comparison expression (different address spaces) Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/macvtap.c2
-rw-r--r--include/linux/if_macvlan.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 992151ce08a4..edcbf1c0d6ed 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -429,7 +429,7 @@ static int macvtap_open(struct inode *inode, struct file *file)
429 if (!q) 429 if (!q)
430 goto out; 430 goto out;
431 431
432 q->sock.wq = &q->wq; 432 RCU_INIT_POINTER(q->sock.wq, &q->wq);
433 init_waitqueue_head(&q->wq.wait); 433 init_waitqueue_head(&q->wq.wait);
434 q->sock.type = SOCK_RAW; 434 q->sock.type = SOCK_RAW;
435 q->sock.state = SS_CONNECTED; 435 q->sock.state = SS_CONNECTED;
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 19121331a5ed..f49a9f66c3d9 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -70,7 +70,7 @@ struct macvlan_dev {
70 int (*receive)(struct sk_buff *skb); 70 int (*receive)(struct sk_buff *skb);
71 int (*forward)(struct net_device *dev, struct sk_buff *skb); 71 int (*forward)(struct net_device *dev, struct sk_buff *skb);
72 /* This array tracks active taps. */ 72 /* This array tracks active taps. */
73 struct macvtap_queue *taps[MAX_MACVTAP_QUEUES]; 73 struct macvtap_queue __rcu *taps[MAX_MACVTAP_QUEUES];
74 /* This list tracks all taps (both enabled and disabled) */ 74 /* This list tracks all taps (both enabled and disabled) */
75 struct list_head queue_list; 75 struct list_head queue_list;
76 int numvtaps; 76 int numvtaps;