diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2013-02-25 18:17:13 +0100 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2013-02-25 18:17:13 +0100 |
| commit | 57d88cffc83a2120266bbe9e72cbba5bd5f33675 (patch) | |
| tree | c1ddd8533eb29f6f7eb25243edb5d448205696b9 /drivers/infiniband | |
| parent | IB/mlx4: Convert is_xxx variables in build_mlx_header() to bool (diff) | |
| download | linux-57d88cffc83a2120266bbe9e72cbba5bd5f33675.tar.xz linux-57d88cffc83a2120266bbe9e72cbba5bd5f33675.zip | |
IB/mlx4: Fix compiler warning about uninitialized 'vlan' variable
Building qp.o triggers this gcc warning:
drivers/infiniband/hw/mlx4/qp.c: In function ‘mlx4_ib_post_send’:
drivers/infiniband/hw/mlx4/qp.c:1862:62: warning: ‘vlan’ may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/infiniband/hw/mlx4/qp.c:1752:6: note: ‘vlan’ was declared here
Looking at the code it is clear 'vlan' is only set and used if 'is_eth'
is non-zero. But by initializing 'vlan' to 0xffff, on
gcc (Ubuntu 4.7.2-22ubuntu1) 4.7.2
on x86-64 at least, we fix the warning, and the compiler was already
setting 'vlan' to 0 in the generated code, so there's no real downside.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
[ Get rid of unnecessary move of 'is_vlan' initialization. - Roland ]
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/qp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index f8ac5333504d..ebadebe83b11 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c @@ -1747,7 +1747,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr, int spc; int i; int err = 0; - u16 vlan; + u16 vlan = 0xffff; bool is_eth; bool is_vlan = false; bool is_grh; |