From 69d9ff1ac630a7ed121ef81a0a94d99e06c25119 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 26 Apr 2014 18:55:16 +0200 Subject: [PATCH] staging: r8723au: Fix endian errors in descriptor get and set macros There are several macros used to get and set portions of the RX and TX descriptor information that need to be converted to be endian correct. The following sparse warnings are fixed: drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2477:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2477:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2479:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2479:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2479:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2479:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2479:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2479:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2649:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2649:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2651:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2651:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2651:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2651:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2651:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2651:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2863:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2863:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2865:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2865:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2865:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2865:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2865:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2865:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2996:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2996:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2998:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2998:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2998:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2998:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2998:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:2998:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3105:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3105:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3105:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3164:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3164:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3167:17: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3167:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3167:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3167:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3167:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3167:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3313:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3313:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3315:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3315:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3315:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3315:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3315:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3315:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3581:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3581:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3581:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3583:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3583:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3583:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3586:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3586:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3586:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3592:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3592:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3594:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3594:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3594:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3594:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3594:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3594:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3702:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3702:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3702:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3704:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3704:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3704:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3707:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3707:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3707:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3711:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3711:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3711:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3713:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3713:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3713:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3715:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3715:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3715:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3721:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3721:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3723:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3723:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3723:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3723:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3723:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3723:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3827:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3827:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3829:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3829:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3829:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3829:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3829:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3829:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3938:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3938:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3940:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3940:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3940:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3940:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3940:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:3940:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4010:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4010:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4012:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4012:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4012:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4012:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4012:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4012:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4199:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4199:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4201:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4201:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4201:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4201:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4201:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4201:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4509:28: warning: too many warnings drivers/staging/rtl8723au/core/rtw_xmit.c:940:9: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_xmit.c:940:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:940:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:940:9: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:940:9: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:940:9: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:946:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:946:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:946:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:957:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:957:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:957:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:980:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:980:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:980:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:982:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:982:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:982:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:986:33: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:986:33: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:986:33: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:987:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:987:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:987:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:988:25: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:988:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:988:25: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:997:25: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:997:25: warning: cast to restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:1176:17: warning: invalid assignment: |= drivers/staging/rtl8723au/core/rtw_xmit.c:1176:17: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:1176:17: right side has type restricted __le16 drivers/staging/rtl8723au/core/rtw_xmit.c:1260:25: warning: invalid assignment: &= drivers/staging/rtl8723au/core/rtw_xmit.c:1260:25: left side has type unsigned short drivers/staging/rtl8723au/core/rtw_xmit.c:1260:25: right side has type fouled restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:224:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:224:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:226:9: warning: invalid assignment: &= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:226:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:226:9: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:226:9: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:226:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:226:9: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:316:9: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:316:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:316:9: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:317:9: warning: invalid assignment: &= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:317:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:317:9: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:317:9: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:317:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:317:9: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:320:9: warning: incorrect type in assignment (different base types) drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:320:9: expected unsigned short [unsigned] [short] drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:320:9: got restricted __le16 [usertype] drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:354:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:354:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:354:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:358:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:358:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:358:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:366:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:366:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:366:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:382:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:382:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:387:17: warning: invalid assignment: &= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:387:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:387:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:387:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:387:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:387:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:390:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:390:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:390:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:391:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:391:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:391:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:395:17: warning: invalid assignment: &= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:395:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:395:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:395:17: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:395:17: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:395:17: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:426:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:426:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:427:9: warning: invalid assignment: &= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:427:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:427:9: right side has type restricted __le16 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:427:9: warning: invalid assignment: |= drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:427:9: left side has type unsigned short drivers/staging/rtl8723au/hal/rtl8723a_cmd.c:427:9: right side has type restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:319:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:319:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:323:17: warning: invalid assignment: &= drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:323:17: left side has type unsigned short drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:323:17: right side has type restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:323:17: warning: invalid assignment: |= drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:323:17: left side has type unsigned short drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:323:17: right side has type restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:326:17: warning: invalid assignment: &= drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:326:17: left side has type unsigned short drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:326:17: right side has type restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:326:17: warning: invalid assignment: |= drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:326:17: left side has type unsigned short drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:326:17: right side has type restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2368:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2368:9: warning: cast to restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2370:9: warning: invalid assignment: &= drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2370:9: left side has type unsigned short drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2370:9: right side has type restricted __le16 drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2370:9: warning: invalid assignment: |= drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2370:9: left side has type unsigned short drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c:2370:9: right side has type restricted __le16 The following new warnings were temporarily added: drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4509:28: warning: incorrect type in assignment (different base types) drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4509:28: expected unsigned short [unsigned] [assigned] [usertype] capab_info drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4509:28: got restricted __le16 [usertype] capab_info drivers/staging/rtl8723au/core/rtw_mlme_ext.c:4612:17: warning: cast to restricted __le32 drivers/staging/rtl8723au/core/rtw_mlme_ext.c:5549:6: warning: symbol 'linked23a_rx_sig_stren_disp' was not declared. Should it be static? Signed-off-by: Larry Finger Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/include/wifi.h | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8723au/include/wifi.h b/drivers/staging/rtl8723au/include/wifi.h index 57ad44e..aebc05d 100644 --- a/drivers/staging/rtl8723au/include/wifi.h +++ b/drivers/staging/rtl8723au/include/wifi.h @@ -82,42 +82,42 @@ enum WIFI_REG_DOMAIN { #define SetToDs(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_TODS)) #define SetFrDs(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_FROMDS)) #define get_tofr_ds(pframe) ((ieee80211_has_tods(pframe) << 1) | \ ieee80211_has_fromds(pframe)) #define SetMFrag(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) #define ClearMFrag(pbuf) \ - (*(unsigned short *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS))) + (*(__le16 *)(pbuf) &= (~cpu_to_le16(IEEE80211_FCTL_MOREFRAGS))) #define SetRetry(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_RETRY)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_RETRY)) #define SetPwrMgt(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PM)) #define SetMData(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_MOREDATA)) #define SetPrivacy(pbuf) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED)) + (*(__le16 *)(pbuf) |= cpu_to_le16(IEEE80211_FCTL_PROTECTED)) #define SetFrameType(pbuf, type) \ do { \ - *(unsigned short *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ - *(unsigned short *)(pbuf) |= __constant_cpu_to_le16(type); \ + *(__le16 *)(pbuf) &= __constant_cpu_to_le16(~(BIT(3) | BIT(2))); \ + *(__le16 *)(pbuf) |= __constant_cpu_to_le16(type); \ } while (0) #define SetFrameSubType(pbuf, type) \ do { \ - *(unsigned short *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \ - *(unsigned short *)(pbuf) |= cpu_to_le16(type); \ + *(__le16 *)(pbuf) &= cpu_to_le16(~(BIT(7) | BIT(6) | BIT(5) | BIT(4) | BIT(3) | BIT(2))); \ + *(__le16 *)(pbuf) |= cpu_to_le16(type); \ } while (0) #define GetTupleCache(pbuf) (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) + 22))) @@ -131,26 +131,26 @@ enum WIFI_REG_DOMAIN { #define SetSeqNum(pbuf, num) \ do { \ - *(unsigned short *)((unsigned long)(pbuf) + 22) = \ - ((*(unsigned short *)((unsigned long)(pbuf) + 22)) & le16_to_cpu((unsigned short)0x000f)) | \ - le16_to_cpu((unsigned short)(0xfff0 & (num << 4))); \ + *(__le16 *)((size_t)(pbuf) + 22) = \ + ((*(__le16 *)((size_t)(pbuf) + 22)) & cpu_to_le16((unsigned short)0x000f)) | \ + cpu_to_le16((unsigned short)(0xfff0 & (num << 4))); \ } while (0) #define SetDuration(pbuf, dur) \ - (*(unsigned short *)((unsigned long)(pbuf) + 2) = \ + (*(__le16 *)((unsigned long)(pbuf) + 2) = \ cpu_to_le16(0xffff & (dur))) #define SetPriority(pbuf, tid) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16(tid & 0xf)) + (*(__le16 *)(pbuf) |= cpu_to_le16(tid & 0xf)) #define SetEOSP(pbuf, eosp) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16((eosp & 1) << 4)) + (*(__le16 *)(pbuf) |= cpu_to_le16((eosp & 1) << 4)) #define SetAckpolicy(pbuf, ack) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16((ack & 3) << 5)) + (*(__le16 *)(pbuf) |= cpu_to_le16((ack & 3) << 5)) #define SetAMsdu(pbuf, amsdu) \ - (*(unsigned short *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)) + (*(__le16 *)(pbuf) |= cpu_to_le16((amsdu & 1) << 7)) #define GetAid(pbuf) \ (cpu_to_le16(*(unsigned short *)((unsigned long)(pbuf) + 2)) & \ -- 2.7.4