aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg2013-02-19 17:56:27 -0600
committerJohannes Berg2013-02-25 17:09:21 -0600
commit162589f7b162b916ac377753c086e3ba76a9f33d (patch)
treef0eef7bf14dd1f9fb28162b5bf0a39e2ea041804
parent1c33a0594583059afc983b5ad3c3352849cd5205 (diff)
downloadam43-linux-kernel-162589f7b162b916ac377753c086e3ba76a9f33d.tar.gz
am43-linux-kernel-162589f7b162b916ac377753c086e3ba76a9f33d.tar.xz
am43-linux-kernel-162589f7b162b916ac377753c086e3ba76a9f33d.zip
nl80211: remove TCP WoWLAN information
Just like the radar information, the TCP WoWLAN capability data can increase the wiphy information and make it too big. Remove the TCP WoWLAN information; no driver supports it and new userspace tools will be required as well. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/nl80211.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index cf4c7947f33..e652d05ff71 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -904,48 +904,6 @@ nla_put_failure:
904 return -ENOBUFS; 904 return -ENOBUFS;
905} 905}
906 906
907#ifdef CONFIG_PM
908static int nl80211_send_wowlan_tcp_caps(struct cfg80211_registered_device *rdev,
909 struct sk_buff *msg)
910{
911 const struct wiphy_wowlan_tcp_support *tcp = rdev->wiphy.wowlan.tcp;
912 struct nlattr *nl_tcp;
913
914 if (!tcp)
915 return 0;
916
917 nl_tcp = nla_nest_start(msg, NL80211_WOWLAN_TRIG_TCP_CONNECTION);
918 if (!nl_tcp)
919 return -ENOBUFS;
920
921 if (nla_put_u32(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD,
922 tcp->data_payload_max))
923 return -ENOBUFS;
924
925 if (nla_put_u32(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD,
926 tcp->data_payload_max))
927 return -ENOBUFS;
928
929 if (tcp->seq && nla_put_flag(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD_SEQ))
930 return -ENOBUFS;
931
932 if (tcp->tok && nla_put(msg, NL80211_WOWLAN_TCP_DATA_PAYLOAD_TOKEN,
933 sizeof(*tcp->tok), tcp->tok))
934 return -ENOBUFS;
935
936 if (nla_put_u32(msg, NL80211_WOWLAN_TCP_DATA_INTERVAL,
937 tcp->data_interval_max))
938 return -ENOBUFS;
939
940 if (nla_put_u32(msg, NL80211_WOWLAN_TCP_WAKE_PAYLOAD,
941 tcp->wake_payload_max))
942 return -ENOBUFS;
943
944 nla_nest_end(msg, nl_tcp);
945 return 0;
946}
947#endif
948
949static int nl80211_send_wiphy(struct sk_buff *msg, u32 portid, u32 seq, int flags, 907static int nl80211_send_wiphy(struct sk_buff *msg, u32 portid, u32 seq, int flags,
950 struct cfg80211_registered_device *dev) 908 struct cfg80211_registered_device *dev)
951{ 909{
@@ -1320,9 +1278,6 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 portid, u32 seq, int flag
1320 goto nla_put_failure; 1278 goto nla_put_failure;
1321 } 1279 }
1322 1280
1323 if (nl80211_send_wowlan_tcp_caps(dev, msg))
1324 goto nla_put_failure;
1325
1326 nla_nest_end(msg, nl_wowlan); 1281 nla_nest_end(msg, nl_wowlan);
1327 } 1282 }
1328#endif 1283#endif