Content-Security-Policy: default-src 'none'
Content-Type: text/plain; charset=UTF-8
Content-Length: 714
Content-Disposition: inline; filename="381-ibss_modes.patch"
Last-Modified: Sun, 16 Feb 2025 01:10:36 GMT
Expires: Wed, 14 Feb 2035 01:10:36 GMT
ETag: "38969b0532a435fe4264874e9fa526359a697d67"

--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -1260,7 +1260,10 @@ ath_vap_create(struct ieee80211com *ic,
 	case IEEE80211_M_IBSS:
 		if ((sc->sc_nvaps != 0) && (ic->ic_opmode == IEEE80211_M_STA))
 			return NULL;
-		ic_opmode = opmode;
+		if (ic->ic_opmode == IEEE80211_M_HOSTAP)
+			ic_opmode = ic->ic_opmode;
+		else
+			ic_opmode = opmode;
 		break;
 	case IEEE80211_M_AHDEMO:
 	case IEEE80211_M_MONITOR:
@@ -1455,7 +1458,7 @@ ath_vap_create(struct ieee80211com *ic,
 	 * frames.  Other modes carry over directly to the HAL.
 	 */
 	if (ic->ic_opmode == IEEE80211_M_AHDEMO)
-		sc->sc_opmode = HAL_M_IBSS;
+		sc->sc_opmode = HAL_M_HOSTAP;
 	else
 		sc->sc_opmode = (HAL_OPMODE) ic->ic_opmode;	/* NB: compatible */
 
ss='main'><a href='/cgit.cgi/'>index</a> : <a title='openwrt/upstream' href='/cgit.cgi/openwrt/upstream/'>openwrt/upstream</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='ada4206cc5088ef2cd317f4f9eeeec2d3e905405'/><select name='h' onchange='this.form.submit();'>
<option value='attitude_adjustment'>attitude_adjustment</option>
<option value='barrier_breaker'>barrier_breaker</option>
<option value='chaos_calmer'>chaos_calmer</option>
<option value='lede-17.01'>lede-17.01</option>
<option value='less-old-master'>less-old-master</option>
<option value='master'>master</option>
<option value='old-master'>old-master</option>
<option value='openwrt-18.06'>openwrt-18.06</option>
<option value='openwrt-19.07'>openwrt-19.07</option>
<option value='upstream'>upstream</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>upstream openwrt</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/openwrt/upstream/about/?h=v19.07.9'>about</a><a href='/cgit.cgi/openwrt/upstream/?h=v19.07.9'>summary</a><a href='/cgit.cgi/openwrt/upstream/refs/?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>refs</a><a href='/cgit.cgi/openwrt/upstream/log/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9'>log</a><a class='active' href='/cgit.cgi/openwrt/upstream/tree/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>tree</a><a href='/cgit.cgi/openwrt/upstream/commit/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>commit</a><a href='/cgit.cgi/openwrt/upstream/diff/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>diff</a><a href='/cgit.cgi/openwrt/upstream/stats/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/upstream/log/package/madwifi/patches/432-netdev_ops.patch'>
<input type='hidden' name='h' value='v19.07.9'/><input type='hidden' name='id' value='ada4206cc5088ef2cd317f4f9eeeec2d3e905405'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/openwrt/upstream/tree/?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>root</a>/<a href='/cgit.cgi/openwrt/upstream/tree/package?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>package</a>/<a href='/cgit.cgi/openwrt/upstream/tree/package/madwifi?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>madwifi</a>/<a href='/cgit.cgi/openwrt/upstream/tree/package/madwifi/patches?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>patches</a>/<a href='/cgit.cgi/openwrt/upstream/tree/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>432-netdev_ops.patch</a></div><div class='content'>blob: af829b164a7401d881e8560e718732bbca9143e8 (<a href='/cgit.cgi/openwrt/upstream/plain/package/madwifi/patches/432-netdev_ops.patch?h=v19.07.9&amp;id=ada4206cc5088ef2cd317f4f9eeeec2d3e905405'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
<a id='n102' href='#n102'>102</a>
<a id='n103' href='#n103'>103</a>
<a id='n104' href='#n104'>104</a>
<a id='n105' href='#n105'>105</a>
<a id='n106' href='#n106'>106</a>
<a id='n107' href='#n107'>107</a>
<a id='n108' href='#n108'>108</a>
<a id='n109' href='#n109'>109</a>
<a id='n110' href='#n110'>110</a>
<a id='n111' href='#n111'>111</a>
<a id='n112' href='#n112'>112</a>
<a id='n113' href='#n113'>113</a>
<a id='n114' href='#n114'>114</a>
<a id='n115' href='#n115'>115</a>
<a id='n116' href='#n116'>116</a>
<a id='n117' href='#n117'>117</a>
<a id='n118' href='#n118'>118</a>
<a id='n119' href='#n119'>119</a>
<a id='n120' href='#n120'>120</a>
<a id='n121' href='#n121'>121</a>
<a id='n122' href='#n122'>122</a>
<a id='n123' href='#n123'>123</a>
<a id='n124' href='#n124'>124</a>
<a id='n125' href='#n125'>125</a>
<a id='n126' href='#n126'>126</a>
<a id='n127' href='#n127'>127</a>
<a id='n128' href='#n128'>128</a>
<a id='n129' href='#n129'>129</a>
<a id='n130' href='#n130'>130</a>
<a id='n131' href='#n131'>131</a>
<a id='n132' href='#n132'>132</a>
<a id='n133' href='#n133'>133</a>
<a id='n134' href='#n134'>134</a>
<a id='n135' href='#n135'>135</a>
<a id='n136' href='#n136'>136</a>
<a id='n137' href='#n137'>137</a>
<a id='n138' href='#n138'>138</a>
<a id='n139' href='#n139'>139</a>
<a id='n140' href='#n140'>140</a>
<a id='n141' href='#n141'>141</a>
<a id='n142' href='#n142'>142</a>
<a id='n143' href='#n143'>143</a>
<a id='n144' href='#n144'>144</a>
<a id='n145' href='#n145'>145</a>
<a id='n146' href='#n146'>146</a>
<a id='n147' href='#n147'>147</a>
<a id='n148' href='#n148'>148</a>
<a id='n149' href='#n149'>149</a>
<a id='n150' href='#n150'>150</a>
<a id='n151' href='#n151'>151</a>
<a id='n152' href='#n152'>152</a>
<a id='n153' href='#n153'>153</a>
<a id='n154' href='#n154'>154</a>
<a id='n155' href='#n155'>155</a>
<a id='n156' href='#n156'>156</a>
<a id='n157' href='#n157'>157</a>
<a id='n158' href='#n158'>158</a>
<a id='n159' href='#n159'>159</a>
<a id='n160' href='#n160'>160</a>
<a id='n161' href='#n161'>161</a>
<a id='n162' href='#n162'>162</a>
<a id='n163' href='#n163'>163</a>
<a id='n164' href='#n164'>164</a>
<a id='n165' href='#n165'>165</a>
<a id='n166' href='#n166'>166</a>
<a id='n167' href='#n167'>167</a>
<a id='n168' href='#n168'>168</a>
<a id='n169' href='#n169'>169</a>
<a id='n170' href='#n170'>170</a>
<a id='n171' href='#n171'>171</a>
<a id='n172' href='#n172'>172</a>
<a id='n173' href='#n173'>173</a>
<a id='n174' href='#n174'>174</a>
<a id='n175' href='#n175'>175</a>
<a id='n176' href='#n176'>176</a>
<a id='n177' href='#n177'>177</a>
<a id='n178' href='#n178'>178</a>
<a id='n179' href='#n179'>179</a>
<a id='n180' href='#n180'>180</a>
<a id='n181' href='#n181'>181</a>
<a id='n182' href='#n182'>182</a>
<a id='n183' href='#n183'>183</a>
<a id='n184' href='#n184'>184</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; margin: 0; }
td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight { background: #ffffff; }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span>Convert to net_device_ops for Linux 2.6.29+
http://madwifi-project.org/changeset/4005
<span class="gd">--- a/ath/if_ath.c</span>
<span class="gi">+++ b/ath/if_ath.c</span>
<span class="gu">@@ -566,6 +566,20 @@ static inline int rate_factor(int mode)</span>
 
 /* Initialize ath_softc structure */
 
<span class="gi">+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,29)</span>
<span class="gi">+static const struct net_device_ops ath_netdev_ops = {</span>
<span class="gi">+	.ndo_open		= ath_init,</span>
<span class="gi">+	.ndo_stop		= ath_stop,</span>
<span class="gi">+	.ndo_start_xmit		= ath_hardstart,</span>
<span class="gi">+	.ndo_tx_timeout 	= ath_tx_timeout,</span>
<span class="gi">+	.ndo_set_multicast_list = ath_mode_init,</span>
<span class="gi">+	.ndo_do_ioctl		= ath_ioctl,</span>
<span class="gi">+	.ndo_get_stats		= ath_getstats,</span>
<span class="gi">+	.ndo_set_mac_address	= ath_set_mac_address,</span>
<span class="gi">+	.ndo_change_mtu 	= ath_change_mtu,</span>
<span class="gi">+};</span>
<span class="gi">+#endif</span>
<span class="gi">+</span>
 int
 ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
 {
<span class="gu">@@ -865,16 +879,20 @@ ath_attach(u_int16_t devid, struct net_d</span>
 	}
 
 	/* NB: ether_setup is done by bus-specific code */
<span class="gi">+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,29)</span>
 	dev-&gt;open = ath_init;
 	dev-&gt;stop = ath_stop;
 	dev-&gt;hard_start_xmit = ath_hardstart;
 	dev-&gt;tx_timeout = ath_tx_timeout;
<span class="gd">-	dev-&gt;watchdog_timeo = 5 * HZ;</span>
 	dev-&gt;set_multicast_list = ath_mode_init;
 	dev-&gt;do_ioctl = ath_ioctl;
 	dev-&gt;get_stats = ath_getstats;
 	dev-&gt;set_mac_address = ath_set_mac_address;
 	dev-&gt;change_mtu = ath_change_mtu;
<span class="gi">+#else</span>
<span class="gi">+	dev-&gt;netdev_ops = &amp;ath_netdev_ops;</span>
<span class="gi">+#endif</span>
<span class="gi">+	dev-&gt;watchdog_timeo = 5 * HZ;</span>
 	dev-&gt;tx_queue_len = ATH_TXBUF - ATH_TXBUF_MGT_RESERVED;
 #if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,24)
 	netif_napi_add(dev, &amp;sc-&gt;sc_napi, ath_rx_poll, 64);
<span class="gu">@@ -1257,7 +1275,6 @@ ath_detach(struct net_device *dev)</span>
 	ath_dynamic_sysctl_unregister(sc);
 	ATH_LOCK_DESTROY(sc);
 	ATH_HAL_LOCK_DESTROY(sc);
<span class="gd">-	dev-&gt;stop = NULL; /* prevent calling ath_stop again */</span>
 	unregister_netdev(dev);
 	return 0;
 }
<span class="gu">@@ -12732,8 +12749,13 @@ ath_rcv_dev_event(struct notifier_block</span>
 	struct net_device *dev = (struct net_device *)ptr;
 	struct ath_softc *sc = (struct ath_softc *)netdev_priv(dev);
 
<span class="gi">+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,29)</span>
 	if (!dev || !sc || dev-&gt;open != &amp;ath_init)
 		return 0;
<span class="gi">+#else</span>
<span class="gi">+	if (!dev || !sc || dev-&gt;netdev_ops-&gt;ndo_open != &amp;ath_init)</span>
<span class="gi">+		return 0;</span>
<span class="gi">+#endif</span>
 
 	switch (event) {
 	case NETDEV_CHANGENAME:
<span class="gd">--- a/net80211/ieee80211.c</span>
<span class="gi">+++ b/net80211/ieee80211.c</span>
<span class="gu">@@ -451,6 +451,18 @@ ieee80211_ifdetach(struct ieee80211com *</span>
 }
 EXPORT_SYMBOL(ieee80211_ifdetach);
 
<span class="gi">+#if LINUX_VERSION_CODE &gt;= KERNEL_VERSION(2,6,29)</span>
<span class="gi">+static const struct net_device_ops ieee80211_netdev_ops = {</span>
<span class="gi">+	.ndo_get_stats		= ieee80211_getstats,</span>
<span class="gi">+	.ndo_open		= ieee80211_open,</span>
<span class="gi">+	.ndo_stop		= ieee80211_stop,</span>
<span class="gi">+	.ndo_start_xmit		= ieee80211_hardstart,</span>
<span class="gi">+	.ndo_set_multicast_list = ieee80211_set_multicast_list,</span>
<span class="gi">+	.ndo_change_mtu 	= ieee80211_change_mtu,</span>
<span class="gi">+	.ndo_do_ioctl		= ieee80211_ioctl,</span>
<span class="gi">+};</span>
<span class="gi">+#endif</span>
<span class="gi">+</span>
 int
 ieee80211_vap_setup(struct ieee80211com *ic, struct net_device *dev,
 	const char *name, int opmode, int flags, struct ieee80211vap *master)
<span class="gu">@@ -471,16 +483,21 @@ ieee80211_vap_setup(struct ieee80211com</span>
 		} else
 			strncpy(dev-&gt;name, name, sizeof(dev-&gt;name));
 	}
<span class="gi">+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,29)</span>
 
 	dev-&gt;get_stats = ieee80211_getstats;
 	dev-&gt;open = ieee80211_open;
 	dev-&gt;stop = ieee80211_stop;
 	dev-&gt;hard_start_xmit = ieee80211_hardstart;
 	dev-&gt;set_multicast_list = ieee80211_set_multicast_list;
<span class="gi">+	dev-&gt;do_ioctl = ieee80211_ioctl;</span>
 #if 0
 	dev-&gt;set_mac_address = ieee80211_set_mac_address;
 #endif
  	dev-&gt;change_mtu = ieee80211_change_mtu;
<span class="gi">+#else</span>
<span class="gi">+	dev-&gt;netdev_ops = &amp;ieee80211_netdev_ops;</span>
<span class="gi">+#endif</span>
 	dev-&gt;tx_queue_len = 0;			/* NB: bypass queuing */
 	dev-&gt;hard_header_len = parent-&gt;hard_header_len;
 	/*
<span class="gu">@@ -1824,7 +1841,11 @@ ieee80211_set_multicast_list(struct net_</span>
 	IEEE80211_UNLOCK_IRQ(ic);
 
 	/* XXX: Merge multicast list into parent device */
<span class="gi">+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,29)</span>
 	parent-&gt;set_multicast_list(ic-&gt;ic_dev);
<span class="gi">+#else</span>
<span class="gi">+	parent-&gt;netdev_ops-&gt;ndo_set_multicast_list(ic-&gt;ic_dev);</span>
<span class="gi">+#endif</span>
 }
 
 void
<span class="gd">--- a/net80211/ieee80211_linux.c</span>
<span class="gi">+++ b/net80211/ieee80211_linux.c</span>
<span class="gu">@@ -984,8 +984,14 @@ ieee80211_rcv_dev_event(struct notifier_</span>
 	void *ptr)
 {
 	struct net_device *dev = (struct net_device *) ptr;
<span class="gi">+</span>
<span class="gi">+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,29)</span>
 	if (!dev || dev-&gt;open != &amp;ieee80211_open)
 		return 0;
<span class="gi">+#else</span>
<span class="gi">+	if (!dev || dev-&gt;netdev_ops-&gt;ndo_open != &amp;ieee80211_open)</span>
<span class="gi">+		return 0;</span>
<span class="gi">+#endif</span>
 
 	switch (event) {
 	case NETDEV_CHANGENAME:
<span class="gd">--- a/net80211/ieee80211_var.h</span>
<span class="gi">+++ b/net80211/ieee80211_var.h</span>
<span class="gu">@@ -739,6 +739,7 @@ void ieee80211_build_sc_ie(struct ieee80</span>
 void ieee80211_dfs_action(struct ieee80211com *);
 void ieee80211_expire_channel_excl_restrictions(struct ieee80211com *);
 void ieee80211_setpuregbasicrates(struct ieee80211_rateset *rs);
<span class="gi">+int ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</span>
 
 /*
  * Iterate through ic_channels to enumerate all distinct ic_ieee channel numbers.
<span class="gd">--- a/net80211/ieee80211_wireless.c</span>
<span class="gi">+++ b/net80211/ieee80211_wireless.c</span>
<span class="gu">@@ -5954,7 +5954,7 @@ static struct iw_handler_def ieee80211_i</span>
 /*
  * Handle private ioctl requests.
  */
<span class="gd">-static int</span>
<span class="gi">+int</span>
 ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	struct ieee80211vap *vap = netdev_priv(dev);
<span class="gu">@@ -6044,7 +6044,6 @@ ieee80211_ioctl_vattach(struct ieee80211</span>
 {
 	struct net_device *dev = vap-&gt;iv_dev;
 
<span class="gd">-	dev-&gt;do_ioctl = ieee80211_ioctl;</span>
 #if IW_HANDLER_VERSION &lt; 7
 	dev-&gt;get_wireless_stats = ieee80211_iw_getstats;
 #endif
<span class="gd">--- a/net80211/ieee80211_input.c</span>
<span class="gi">+++ b/net80211/ieee80211_input.c</span>
<span class="gu">@@ -1188,7 +1188,11 @@ ieee80211_deliver_data(struct ieee80211_</span>
 			skb1-&gt;protocol = __constant_htons(ETH_P_802_2);
 			/* XXX insert vlan tag before queue it? */
 			ni_tmp = SKB_CB(skb1)-&gt;ni; /* remember node so we can free it */
<span class="gi">+#if LINUX_VERSION_CODE &lt; KERNEL_VERSION(2,6,29)</span>
 			ret = dev-&gt;hard_start_xmit(skb1, dev);
<span class="gi">+#else</span>
<span class="gi">+			ret = dev-&gt;netdev_ops-&gt;ndo_start_xmit(skb1, dev);</span>
<span class="gi">+#endif</span>
 
 			if (ret == NETDEV_TX_BUSY)
 				ieee80211_dev_kfree_skb(&amp;skb1);
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.25.1</a>) at 2025-02-16 01:10:36 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
