You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
This commit is contained in:
+1
-1
@@ -276,7 +276,7 @@ static void hp100_RegisterDump(struct net_device *dev);
|
||||
* Convert an address in a kernel buffer to a bus/phys/dma address.
|
||||
* This work *only* for memory fragments part of lp->page_vaddr,
|
||||
* because it was properly DMA allocated via pci_alloc_consistent(),
|
||||
* so we just need to "retreive" the original mapping to bus/phys/dma
|
||||
* so we just need to "retrieve" the original mapping to bus/phys/dma
|
||||
* address - Jean II */
|
||||
static inline dma_addr_t virt_to_whatever(struct net_device *dev, u32 * ptr)
|
||||
{
|
||||
|
||||
@@ -1598,7 +1598,7 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
|
||||
switch(cmd) {
|
||||
case SIOCGMIIPHY: /* Get the address of the PHY in use. */
|
||||
data[0] = 0; /* we have only this address */
|
||||
/* fall trough */
|
||||
/* fall through */
|
||||
case SIOCGMIIREG: /* Read the specified MII register. */
|
||||
data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
|
||||
break;
|
||||
|
||||
@@ -180,7 +180,7 @@ SkDimModerate(SK_AC *pAC) {
|
||||
/*
|
||||
** The number of interrupts per sec is the same as expected.
|
||||
** Evalulate the descriptor-ratio. If it has changed, a resize
|
||||
** in the moderation timer might be usefull
|
||||
** in the moderation timer might be useful
|
||||
*/
|
||||
if (M_DIMINFO.AutoSizing) {
|
||||
ResizeDimTimerDuration(pAC);
|
||||
|
||||
@@ -2851,7 +2851,7 @@ unsigned long Flags; /* for spin lock */
|
||||
* Description:
|
||||
* This function is called if an ioctl is issued on the device.
|
||||
* There are three subfunction for reading, writing and test-writing
|
||||
* the private MIB data structure (usefull for SysKonnect-internal tools).
|
||||
* the private MIB data structure (useful for SysKonnect-internal tools).
|
||||
*
|
||||
* Returns:
|
||||
* 0, if everything is ok
|
||||
|
||||
@@ -611,7 +611,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */
|
||||
* Description:
|
||||
* Calls a general sub-function for all this stuff. The preset does
|
||||
* the same as a set, but returns just before finally setting the
|
||||
* new value. This is usefull to check if a set might be successfull.
|
||||
* new value. This is useful to check if a set might be successfull.
|
||||
* If the instance -1 is passed, an array of values is supposed and
|
||||
* all instances of the OID will be set.
|
||||
*
|
||||
@@ -654,7 +654,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */
|
||||
* Description:
|
||||
* Calls a general sub-function for all this stuff. The preset does
|
||||
* the same as a set, but returns just before finally setting the
|
||||
* new value. This is usefull to check if a set might be successfull.
|
||||
* new value. This is useful to check if a set might be successfull.
|
||||
* If the instance -1 is passed, an array of values is supposed and
|
||||
* all instances of the OID will be set.
|
||||
*
|
||||
@@ -870,7 +870,7 @@ SK_U32 NetIndex) /* NetIndex (0..n), in single net mode always zero */
|
||||
* Description:
|
||||
* Calls a general sub-function for all this set stuff. The preset does
|
||||
* the same as a set, but returns just before finally setting the
|
||||
* new value. This is usefull to check if a set might be successfull.
|
||||
* new value. This is useful to check if a set might be successfull.
|
||||
* The sub-function runs through the IdTable, checks which OIDs are able
|
||||
* to set, and calls the handler function of the OID to perform the
|
||||
* preset. The return value of the function will also be stored in
|
||||
@@ -6473,7 +6473,7 @@ unsigned int PhysPortIndex) /* Physical port index */
|
||||
*
|
||||
* Description:
|
||||
* The COMMON module only tells us if the mode is half or full duplex.
|
||||
* But in the decade of auto sensing it is usefull for the user to
|
||||
* But in the decade of auto sensing it is useful for the user to
|
||||
* know if the mode was negotiated or forced. Therefore we have a
|
||||
* look to the mode, which was last used by the negotiation process.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user