| Message ID | 1374292945-29753-1-git-send-email-pizza@shaftnet.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Solomon Peachy <pizza@shaftnet.org> writes: > Note that the driver doesn't directly use this field, but it should be > correctly defined in any case. > > I'd like to see this in 3.11-rc Comment referring to releases should be after "---" line so that they don't end up in the commit log. And besides, I don't think this is important enough for -rc. I doubt there are users who absolutely need this quickly and this patch can wait for the next merge window. > Signed-off-by: Solomon Peachy <pizza@shaftnet.org> > --- <--- Add the comment here. > drivers/net/wireless/cw1200/wsm.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/cw1200/wsm.h b/drivers/net/wireless/cw1200/wsm.h > index 7afc613..48086e8 100644 > --- a/drivers/net/wireless/cw1200/wsm.h > +++ b/drivers/net/wireless/cw1200/wsm.h
On Sat, Jul 20, 2013 at 09:12:16AM +0300, Kalle Valo wrote: > Comment referring to releases should be after "---" line so that they > don't end up in the commit log. Duly noted. > And besides, I don't think this is important enough for -rc. I doubt > there are users who absolutely need this quickly and this patch can wait > for the next merge window. This is effectively a documentation fix, since the driver currently sets that field to '0' (ie "use firmware default"). That said, while it's trivial, it's a fix nonetheless. As long as the patch doesn't get dropped. I have my preference, but I'll leave exactly when it gets merged to Linville's disretion. (I have some not-yet-finished new work that's clearly -next material, and two patches that need to go into -backports, as soon as I figure out how to integrate that) - Solomon
diff --git a/drivers/net/wireless/cw1200/wsm.h b/drivers/net/wireless/cw1200/wsm.h index 7afc613..48086e8 100644 --- a/drivers/net/wireless/cw1200/wsm.h +++ b/drivers/net/wireless/cw1200/wsm.h @@ -832,7 +832,7 @@ struct wsm_tx { /* the MSDU shall be terminated. Overrides the global */ /* dot11MaxTransmitMsduLifeTime setting [optional] */ /* Device will set the default value if this is 0. */ - u32 expire_time; + __le32 expire_time; /* WSM_HT_TX_... */ __le32 ht_tx_parameters;
Note that the driver doesn't directly use this field, but it should be correctly defined in any case. I'd like to see this in 3.11-rc Signed-off-by: Solomon Peachy <pizza@shaftnet.org> --- drivers/net/wireless/cw1200/wsm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)