Skip to contentSkip to conversation

rocker: quiet sparce endianess warnings

PATCH Applied [email protected] 3 participants 5 messages Mar 6, 2015 – Mar 7, 2015

Subsystems (3)
Networking Network drivers Rocker driver
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/2 rocker: quiet sparce endianess warnings

From: Scott Feldman <[email protected]>

Signed-off-by Scott Feldman <[email protected]>
---
 drivers/net/ethernet/rocker/rocker.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/rocker/rocker.c +5 -3
index cc1bbfd..9629352 100644
@@ -2737,7 +2737,8 @@ static struct rocker_neigh_tbl_entry *
 {
 	struct rocker_neigh_tbl_entry *found;
 
-	hash_for_each_possible(rocker->neigh_tbl, found, entry, (u32)ip_addr)
+	hash_for_each_possible(rocker->neigh_tbl, found,
+			       entry, be32_to_cpu(ip_addr))
 		if (found->ip_addr == ip_addr)
 			return found;
 

@@ -2749,7 +2750,8 @@ static void _rocker_neigh_add(struct rocker *rocker,
 {
 	entry->index = rocker->neigh_tbl_next_index++;
 	entry->ref_count++;
-	hash_add(rocker->neigh_tbl, &entry->entry, (u32)entry->ip_addr);
+	hash_add(rocker->neigh_tbl, &entry->entry,
+		 be32_to_cpu(entry->ip_addr));
 }
 
 static void _rocker_neigh_del(struct rocker *rocker,

@@ -2868,7 +2870,7 @@ static int rocker_port_ipv4_resolve(struct rocker_port *rocker_port,
 				    __be32 ip_addr)
 {
 	struct net_device *dev = rocker_port->dev;
-	struct neighbour *n = __ipv4_neigh_lookup(dev, (u32)ip_addr);
+	struct neighbour *n = __ipv4_neigh_lookup(dev, (__force u32)ip_addr);
 	int err = 0;
 
 	if (!n)
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 rocker: sparse: fix dynamic allocation on stack warning

From: Scott Feldman <[email protected]>

Signed-off-by Scott Feldman <[email protected]>
---
 drivers/net/ethernet/rocker/rocker.c |    2 +-
 drivers/net/ethernet/rocker/rocker.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/rocker/rocker.c +1 -1
index 9629352..65e1403 100644
@@ -2955,7 +2955,7 @@ static int rocker_port_vlan_flood_group(struct rocker_port *rocker_port,
 	struct rocker_port *p;
 	struct rocker *rocker = rocker_port->rocker;
 	u32 group_id = ROCKER_GROUP_L2_FLOOD(vlan_id, 0);
-	u32 group_ids[rocker->port_count];
+	u32 group_ids[ROCKER_FP_PORTS_MAX];
 	u8 group_count = 0;
 	int err;
 	int i;
drivers/net/ethernet/rocker/rocker.h +2 -0
index 0a94b7c..51e430d 100644
@@ -27,6 +27,8 @@ enum {
 	ROCKER_ENOBUFS = 105,
 };
 
+#define ROCKER_FP_PORTS_MAX 62
+
 #define PCI_VENDOR_ID_REDHAT		0x1b36
 #define PCI_DEVICE_ID_REDHAT_ROCKER	0x0006
Signature · 1 line
1.7.10.4
Reviewed-by on v1 1/2
#3 lore raw
In reply to [email protected]

On 3/6/15 6:54 PM, [email protected] wrote:
subject spelling s/sparce/sparse/

Quoted 3 lines

From: Scott Feldman <[email protected]>

Signed-off-by Scott Feldman <[email protected]>
Reviewed-by Jonathan Toppins <[email protected]>
Quoted 38 lines
---
  drivers/net/ethernet/rocker/rocker.c |    8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/rocker/rocker.c +5 -3
index cc1bbfd..9629352 100644
@@ -2737,7 +2737,8 @@ static struct rocker_neigh_tbl_entry *
  {
  	struct rocker_neigh_tbl_entry *found;
 
-	hash_for_each_possible(rocker->neigh_tbl, found, entry, (u32)ip_addr)
+	hash_for_each_possible(rocker->neigh_tbl, found,
+			       entry, be32_to_cpu(ip_addr))
  		if (found->ip_addr == ip_addr)
  			return found;
 

@@ -2749,7 +2750,8 @@ static void _rocker_neigh_add(struct rocker *rocker,
  {
  	entry->index = rocker->neigh_tbl_next_index++;
  	entry->ref_count++;
-	hash_add(rocker->neigh_tbl, &entry->entry, (u32)entry->ip_addr);
+	hash_add(rocker->neigh_tbl, &entry->entry,
+		 be32_to_cpu(entry->ip_addr));
  }
 
  static void _rocker_neigh_del(struct rocker *rocker,

@@ -2868,7 +2870,7 @@ static int rocker_port_ipv4_resolve(struct rocker_port *rocker_port,
  				    __be32 ip_addr)
  {
  	struct net_device *dev = rocker_port->dev;
-	struct neighbour *n = __ipv4_neigh_lookup(dev, (u32)ip_addr);
+	struct neighbour *n = __ipv4_neigh_lookup(dev, (__force u32)ip_addr);
  	int err = 0;
 
  	if (!n)