Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[linux-2.6-microblaze.git] / drivers / staging / rtl8192e / rtl819x_HTProc.c

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 48d28c7..3b8efaf 100644 (file)
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -276,7 +276,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap,
        struct rt_hi_throughput *pHT = ieee->pHTInfo;
        struct ht_capab_ele *pCapELE = NULL;
 
-       if ((posHTCap == NULL) || (pHT == NULL)) {
+       if (!posHTCap || !pHT) {
                netdev_warn(ieee->dev,
                            "%s(): posHTCap and pHTInfo are null\n", __func__);
                return;
@@ -357,7 +357,7 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo,
        struct rt_hi_throughput *pHT = ieee->pHTInfo;
        struct ht_info_ele *pHTInfoEle = (struct ht_info_ele *)posHTInfo;
 
-       if ((posHTInfo == NULL) || (pHTInfoEle == NULL)) {
+       if (!posHTInfo || !pHTInfoEle) {
                netdev_warn(ieee->dev,
                            "%s(): posHTInfo and pHTInfoEle are null\n",
                            __func__);
@@ -397,7 +397,7 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo,
 void HTConstructRT2RTAggElement(struct rtllib_device *ieee, u8 *posRT2RTAgg,
                                u8 *len)
 {
-       if (posRT2RTAgg == NULL) {
+       if (!posRT2RTAgg) {
                netdev_warn(ieee->dev, "%s(): posRT2RTAgg is null\n", __func__);
                return;
        }
@@ -420,7 +420,7 @@ static u8 HT_PickMCSRate(struct rtllib_device *ieee, u8 *pOperateMCS)
 {
        u8 i;
 
-       if (pOperateMCS == NULL) {
+       if (!pOperateMCS) {
                netdev_warn(ieee->dev, "%s(): pOperateMCS is null\n", __func__);
                return false;
        }
@@ -453,7 +453,7 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
        u8              mcsRate = 0;
        u8              availableMcsRate[16];
 
-       if (pMCSRateSet == NULL || pMCSFilter == NULL) {
+       if (!pMCSRateSet || !pMCSFilter) {
                netdev_warn(ieee->dev,
                            "%s(): pMCSRateSet and pMCSFilter are null\n",
                            __func__);