[PATCH net-next 1/2] rocker: quiet sparce endianess warnings

[PATCH net-next 1/2] rocker: quiet sparce endianess warnings

[sfeldma]

From: Scott Feldman <sfeldma@gmail.com>

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
 drivers/net/ethernet/rocker/rocker.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index cc1bbfd..9629352 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -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)
-- 
1.7.10.4

[PATCH net-next 2/2] rocker: sparse: fix dynamic allocation on stack warning

[sfeldma]

From: Scott Feldman <sfeldma@gmail.com>

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
 drivers/net/ethernet/rocker/rocker.c |    2 +-
 drivers/net/ethernet/rocker/rocker.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 9629352..65e1403 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -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;
diff --git a/drivers/net/ethernet/rocker/rocker.h b/drivers/net/ethernet/rocker/rocker.h
index 0a94b7c..51e430d 100644
--- a/drivers/net/ethernet/rocker/rocker.h
+++ b/drivers/net/ethernet/rocker/rocker.h
@@ -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
 
-- 
1.7.10.4

Re: [PATCH net-next 1/2] rocker: quiet sparce endianess warnings

[Jonathan Toppins]

On 3/6/15 6:54 PM, sfeldma@gmail.com wrote:
subject spelling s/sparce/sparse/
> From: Scott Feldman <sfeldma@gmail.com>
>
> Signed-off-by: Scott Feldman <sfeldma@gmail.com>

Reviewed-by: Jonathan Toppins <jtoppins@cumulusnetworks.com>

> ---
>   drivers/net/ethernet/rocker/rocker.c |    8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
> index cc1bbfd..9629352 100644
> --- a/drivers/net/ethernet/rocker/rocker.c
> +++ b/drivers/net/ethernet/rocker/rocker.c
> @@ -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)
>

Re: [PATCH net-next 1/2] rocker: quiet sparce endianess warnings

[David Miller]

From: sfeldma@gmail.com
Date: Fri,  6 Mar 2015 15:54:51 -0800

> From: Scott Feldman <sfeldma@gmail.com>
> 
> Signed-off-by: Scott Feldman <sfeldma@gmail.com>

Applied.

Re: [PATCH net-next 2/2] rocker: sparse: fix dynamic allocation on stack warning

[David Miller]

From: sfeldma@gmail.com
Date: Fri,  6 Mar 2015 15:54:52 -0800

> From: Scott Feldman <sfeldma@gmail.com>
> 
> Signed-off-by: Scott Feldman <sfeldma@gmail.com>

Applied, but that's quite a large on-stack allocation in the
kernel.

You might want to use a global per-cpu work area or something like
that.