---

yaml --- r: 376679 b: refs/heads/master c: 3f3e7ce h: refs/heads/master i: 376677: 209c416 376675: c3382eb 376671: 6ad4c4c v: v3
git-mirror · Jun 1, 2013 · a7040b6 · a7040b6
1 parent dc9c5fb
commit a7040b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7581e62f8be462440d7b22c6361f7c9fa4902b
+refs/heads/master: 3f3e7ce4ff87c8ea69acaa7700699fb26baa2914
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
@@ -2374,7 +2374,8 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq,
 	bool incomplete;
 	int i;
 
-	port = list_first_entry(&team->port_list, struct team_port, list);
+	port = list_first_entry_or_null(&team->port_list,
+					struct team_port, list);
 
 start_again:
 	err = __send_and_alloc_skb(&skb, team, portid, send_func);
@@ -2402,8 +2403,8 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq,
 		err = team_nl_fill_one_port_get(skb, one_port);
 		if (err)
 			goto errout;
-	} else {
-		list_for_each_entry(port, &team->port_list, list) {
+	} else if (port) {
+		list_for_each_entry_from(port, &team->port_list, list) {
 			err = team_nl_fill_one_port_get(skb, port);
 			if (err) {
 				if (err == -EMSGSIZE) {