Content-Security-Policy: default-src 'none'
Content-Type: text/plain; charset=UTF-8
Content-Length: 520
Content-Disposition: inline; filename="003-au1000_eth_ioctl.patch"
Last-Modified: Sat, 27 Jul 2024 04:49:49 GMT
Expires: Tue, 25 Jul 2034 04:49:49 GMT
ETag: "58927f590dc0c9d427b48eadb77ea3d36f0fad55"

--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -1113,10 +1113,14 @@ static void au1000_multicast_list(struct
 	writel(reg, &aup->mac->control);
 }
 
+#define AU1000_KNOWN_PHY_IOCTLS        (SIOCGMIIPHY & 0xfff0)
 static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
 	struct au1000_private *aup = netdev_priv(dev);
 
+	if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS)
+		return -EINVAL;
+
 	if (!netif_running(dev))
 		return -EINVAL;
 
g/git/openwrt/upstream' title='openwrt/upstream Git repository'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/cgit.cgi/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='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='e80ab48777d83d8c24fcd397a85649f08b6b5f87'/><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' selected='selected'>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=openwrt-18.06'>about</a><a href='/cgit.cgi/openwrt/upstream/?h=openwrt-18.06'>summary</a><a href='/cgit.cgi/openwrt/upstream/refs/?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>refs</a><a href='/cgit.cgi/openwrt/upstream/log/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06'>log</a><a class='active' href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>tree</a><a href='/cgit.cgi/openwrt/upstream/commit/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>commit</a><a href='/cgit.cgi/openwrt/upstream/diff/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>diff</a><a href='/cgit.cgi/openwrt/upstream/stats/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/upstream/log/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch'>
<input type='hidden' name='h' value='openwrt-18.06'/><input type='hidden' name='id' value='e80ab48777d83d8c24fcd397a85649f08b6b5f87'/><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=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>root</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>target</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>linux</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>generic</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic/pending-3.18?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>pending-3.18</a>/<a href='/cgit.cgi/openwrt/upstream/tree/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>532-jffs2_eofdetect.patch</a></div><div class='content'>blob: 8ce53d8bed54ce225da77dc65e150d89dcf93301 (<a href='/cgit.cgi/openwrt/upstream/plain/target/linux/generic/pending-3.18/532-jffs2_eofdetect.patch?h=openwrt-18.06&amp;id=e80ab48777d83d8c24fcd397a85649f08b6b5f87'>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>
</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><span class="gd">--- a/fs/jffs2/build.c</span>
<span class="gi">+++ b/fs/jffs2/build.c</span>
<span class="gu">@@ -116,6 +116,16 @@ static int jffs2_build_filesystem(struct</span>
 	dbg_fsbuild(&quot;scanned flash completely\n&quot;);
 	jffs2_dbg_dump_block_lists_nolock(c);
 
<span class="gi">+	if (c-&gt;flags &amp; (1 &lt;&lt; 7)) {</span>
<span class="gi">+		printk(&quot;%s(): unlocking the mtd device... &quot;, __func__);</span>
<span class="gi">+		mtd_unlock(c-&gt;mtd, 0, c-&gt;mtd-&gt;size);</span>
<span class="gi">+		printk(&quot;done.\n&quot;);</span>
<span class="gi">+</span>
<span class="gi">+		printk(&quot;%s(): erasing all blocks after the end marker... &quot;, __func__);</span>
<span class="gi">+		jffs2_erase_pending_blocks(c, -1);</span>
<span class="gi">+		printk(&quot;done.\n&quot;);</span>
<span class="gi">+	}</span>
<span class="gi">+</span>
 	dbg_fsbuild(&quot;pass 1 starting\n&quot;);
 	c-&gt;flags |= JFFS2_SB_FLAG_BUILDING;
 	/* Now scan the directory tree, increasing nlink according to every dirent found. */
<span class="gd">--- a/fs/jffs2/scan.c</span>
<span class="gi">+++ b/fs/jffs2/scan.c</span>
<span class="gu">@@ -148,8 +148,14 @@ int jffs2_scan_medium(struct jffs2_sb_in</span>
 		/* reset summary info for next eraseblock scan */
 		jffs2_sum_reset_collected(s);
 
<span class="gd">-		ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb-&gt;offset),</span>
<span class="gd">-						buf_size, s);</span>
<span class="gi">+		if (c-&gt;flags &amp; (1 &lt;&lt; 7)) {</span>
<span class="gi">+			if (mtd_block_isbad(c-&gt;mtd, jeb-&gt;offset))</span>
<span class="gi">+				ret = BLK_STATE_BADBLOCK;</span>
<span class="gi">+			else</span>
<span class="gi">+				ret = BLK_STATE_ALLFF;</span>
<span class="gi">+		} else</span>
<span class="gi">+			ret = jffs2_scan_eraseblock(c, jeb, buf_size?flashbuf:(flashbuf+jeb-&gt;offset),</span>
<span class="gi">+							buf_size, s);</span>
 
 		if (ret &lt; 0)
 			goto out;
<span class="gu">@@ -561,6 +567,17 @@ full_scan:</span>
 			return err;
 	}
 
<span class="gi">+	if ((buf[0] == 0xde) &amp;&amp;</span>
<span class="gi">+		(buf[1] == 0xad) &amp;&amp;</span>
<span class="gi">+		(buf[2] == 0xc0) &amp;&amp;</span>
<span class="gi">+		(buf[3] == 0xde)) {</span>
<span class="gi">+		/* end of filesystem. erase everything after this point */</span>
<span class="gi">+		printk(&quot;%s(): End of filesystem marker found at 0x%x\n&quot;, __func__, jeb-&gt;offset);</span>
<span class="gi">+		c-&gt;flags |= (1 &lt;&lt; 7);</span>
<span class="gi">+</span>
<span class="gi">+		return BLK_STATE_ALLFF;</span>
<span class="gi">+	}</span>
<span class="gi">+</span>
 	/* We temporarily use &#39;ofs&#39; as a pointer into the buffer/jeb */
 	ofs = 0;
 	max_ofs = EMPTY_SCAN_SIZE(c-&gt;sector_size);
</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 2024-07-27 04:49:49 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
